RPM Packaging: update R14 packages

pull/3/head
François Andriot 10 years ago
parent f75d43fdb4
commit 3d08f62f19

@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}"
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ --mandir=%{tde_mandir} \
\ \
--disable-rpath \ --enable-rpath \
--enable-closure \ --enable-closure \
\ \
--with-extra-includes=%{_includedir}/tqt3 \ --with-extra-includes=%{_includedir}/tqt3 \

@ -1,5 +1,6 @@
# Default version for this component # Default version for this component
%define kdecomp fusion-icon %define tde_pkg fusion-icon
%define tde_version 14.0.0
%if "%{?python2_sitelib}" == "" %if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@ -11,7 +12,7 @@
%define _variant .opt %define _variant .opt
%endif %endif
# TDE 3.5.13 specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
@ -27,7 +28,7 @@
%define _docdir %{tde_docdir} %define _docdir %{tde_docdir}
Name: trinity-%{kdecomp} Name: trinity-%{tde_pkg}
Summary: tray icon to launch and manage Compiz Fusion [Trinity] Summary: tray icon to launch and manage Compiz Fusion [Trinity]
Version: 0.0.0+git20071028 Version: 0.0.0+git20071028
Release: 2%{?dist}%{?_variant} Release: 2%{?dist}%{?_variant}
@ -42,7 +43,7 @@ URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [fusion-icon] Allow python installation under /usr instead of tde_prefix # [fusion-icon] Allow python installation under /usr instead of tde_prefix
Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch
@ -65,12 +66,12 @@ decorators.
%prep %prep
%setup -q -n applications/%{kdecomp} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{_libdir} -I%{_includedir}"

@ -23,11 +23,12 @@
%define _docdir %{tde_docdir} %define _docdir %{tde_docdir}
##########
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: barcode and label printing application for Trinity Summary: barcode and label printing application for Trinity
Version: 2.0.6 Version: 2.0.7
Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -50,6 +51,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
Requires: %{name}-tdefile-plugin = %{version}-%{release}
%description %description
KBarcode is a barcode and label printing application for Trinity. It can be used KBarcode is a barcode and label printing application for Trinity. It can be used
@ -70,11 +73,57 @@ supported. Even complex 2D barcodes are supported using third party tools. The
generated barcodes can be directly printed or you can export them into images generated barcodes can be directly printed or you can export them into images
to use them in another application. to use them in another application.
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/kbarcode
%{tde_tdeappdir}/kbarcode-batch.desktop
%{tde_tdeappdir}/kbarcode-editor.desktop
%{tde_tdeappdir}/kbarcode-single.desktop
%{tde_tdeappdir}/kbarcode.desktop
%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
%{tde_datadir}/apps/kbarcode/
%{tde_datadir}/icons/hicolor/*/actions/barcode.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
%{tde_tdedocdir}/HTML/en/kbarcode/
##########
%package tdefile-plugin
Summary: tdefile-plugin for %{name}
Group: Applications/Utilities
#Requires: %{name} = %{version}-%{release}
%description tdefile-plugin
%{summary}.
%files tdefile-plugin
%defattr(-,root,root,-)
%{tde_tdelibdir}/tdefile_kbarcode.la
%{tde_tdelibdir}/tdefile_kbarcode.so
%{tde_datadir}/services/tdefile_kbarcode.desktop
##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -87,7 +136,6 @@ to use them in another application.
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
@ -125,39 +173,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/kbarcode
%{tde_tdelibdir}/tdefile_kbarcode.la
%{tde_tdelibdir}/tdefile_kbarcode.so
%{tde_tdeappdir}/kbarcode-batch.desktop
%{tde_tdeappdir}/kbarcode-editor.desktop
%{tde_tdeappdir}/kbarcode-single.desktop
%{tde_tdeappdir}/kbarcode.desktop
%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
%{tde_datadir}/apps/kbarcode/
%{tde_datadir}/icons/hicolor/*/actions/barcode.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
%{tde_datadir}/services/tdefile_kbarcode.desktop
%{tde_tdedocdir}/HTML/en/kbarcode/
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -553,7 +553,6 @@ Provides: %{name}-tz_TW = %{version}-%{release}
%build %build
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export kde_htmldir="%{tde_tdedocdir}/HTML" export kde_htmldir="%{tde_tdedocdir}/HTML"

@ -176,7 +176,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/services/tdenetman_pptp.desktop %{tde_datadir}/services/tdenetman_pptp.desktop
%{tde_datadir}/services/tdenetman_strongswan.desktop %{tde_datadir}/services/tdenetman_strongswan.desktop
%{tde_datadir}/services/tdenetman_vpnc.desktop %{tde_datadir}/services/tdenetman_vpnc.desktop
%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)

@ -135,8 +135,8 @@ fi
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \
\ \
-DQTDIR="%{tde_datadir}/tqt3" \ -DQTDIR="%{tde_datadir}/tqt3" \
-DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \ -DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \
-DQT_LIBRARY_DIRS="%{tde_libdir}" \ -DQT_LIBRARY_DIR="%{tde_libdir}" \
\ \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \

@ -35,6 +35,7 @@ ffmpeg-devel
fftw-devel fftw-devel
file-devel file-devel
flac-devel flac-devel
flex-devel
fontpackages-devel fontpackages-devel
fribidi-devel fribidi-devel
gamin-devel gamin-devel
@ -80,6 +81,7 @@ libart_lgpl-devel
libblkid-devel libblkid-devel
libcap-devel libcap-devel
libcdio-devel libcdio-devel
libcdio-paranoia-devel
libconfig-devel libconfig-devel
libcurl-devel libcurl-devel
libdvdread-devel libdvdread-devel
@ -162,4 +164,3 @@ xmlto
xorg-x11-font-utils xorg-x11-font-utils
xulrunner-devel xulrunner-devel
xz-devel xz-devel
libcdio-paranoia-devel

@ -664,6 +664,11 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop %{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
%endif %endif
%if 0%{?fedora} >= 20
%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
%endif
%endif %endif
########## ##########

@ -7,9 +7,9 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsol
dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 )); dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
- dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~")); - dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
+ dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+")); + dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+"));
dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false));
dialog->SchemaEditor1->setSchema(config.readEntry("schema")); dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200 --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200
@ -20,8 +20,8 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cp
- s_word_seps= config->readEntry("wordseps",":@-./_~"); - s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+"); + s_word_seps= config->readEntry("wordseps",":@-./_~+");
b_framevis = config->readBoolEntry("has frame",true); b_framevis = config->readBoolEntry("has frame",true);
b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
TQPtrList<TEWidget> tes = activeTEs(); TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200 --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200
@ -30,10 +30,10 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_pa
n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE); m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
- s_word_seps= config->readEntry("wordseps",":@-./_~"); - s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+"); + s_word_seps= config->readEntry("wordseps",":@-./_~+");
n_encoding = config->readNumEntry("encoding",0); n_encoding = config->readNumEntry("encoding",0);
TQFont tmpFont = TDEGlobalSettings::fixedFont();
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200 --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200

Loading…
Cancel
Save