From 472a95e30a3c05be3faa1d42877bc2fb3a50d86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 6 Aug 2013 22:53:07 +0200 Subject: RPM Packaging: update lots of libraries --- redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec | 51 +++++++++++++--------- redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec | 39 ++++++++++------- redhat/libraries/libkipi/libkipi-14.0.0.spec | 51 ++++++++++++---------- .../libksquirrel/libksquirrel-14.0.0.spec | 32 +++++++++----- redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec | 27 +++++++----- .../libraries/libtqt-perl/libtqt-perl-14.0.0.spec | 8 ++-- .../pytdeextensions/pytdeextensions-14.0.0.spec | 2 +- .../python-trinity/python-trinity-14.0.0.spec | 10 ++--- 8 files changed, 128 insertions(+), 92 deletions(-) diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec index a6f4ce8b9..328667ac2 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec @@ -1,5 +1,6 @@ # Default version for this component -%define kdecomp libkdcraw +%define tde_pkg libkdcraw +%define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -14,7 +15,7 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -22,10 +23,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Raw picture decoding C++ library (runtime) [Trinity] -Version: 14.0.0 +Epoch: 1 +Version: 0.1.9 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -38,11 +40,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils %if 0%{?suse_version} BuildRequires: liblcms-devel @@ -71,7 +73,7 @@ libkdcraw contains the library of libkdcraw. %package devel Group: Development/Libraries Summary: RAW picture decoding C++ library (development) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Libkdcraw is a C++ interface around dcraw binary program used to @@ -86,7 +88,7 @@ library documentation is available on kdcraw.h header file. %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -94,17 +96,24 @@ library documentation is available on kdcraw.h header file. %build -unset QTDIR +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -114,7 +123,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{kdecomp} +%find_lang %{tde_pkg} # RHEL4: pkgconfig files do not support 'URL' keyword . %if 0%{?rhel} == 4 @@ -147,7 +156,7 @@ done /sbin/ldconfig || : -%files -f %{kdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_libdir}/libkdcraw.so.4 %{tde_libdir}/libkdcraw.so.4.0.3 @@ -161,5 +170,5 @@ done %{tde_libdir}/pkgconfig/libkdcraw.pc %Changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +* Fri Jul 05 2013 Francois Andriot - 0.1.9-1 +- Initial release for TDE R14.0.0 diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index 26058fe71..6213ea369 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -1,5 +1,6 @@ # Default version for this component -%define kdecomp libkexiv2 +%define tde_pkg libkexiv2 +%define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -14,7 +15,7 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -22,10 +23,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] -Version: 14.0.0 +Epoch: 1 +Version: 0.1.7 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -38,10 +40,10 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -73,7 +75,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %package devel Group: Development/Libraries Summary: Qt like interface for the libexiv2 library (development) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel libkexif2-devel contains development files and documentation for libkexiv2 @@ -87,7 +89,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -95,16 +97,23 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %build -unset QTDIR +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -150,5 +159,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Mon Jun 03 2013 Francois Andriot - 14.0.0-1 +* Fri Jul 05 2013 Francois Andriot - 0.1.7-1 - Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec index 116c8740f..144b1ad24 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec @@ -1,6 +1,6 @@ # Default version for this component -%define tdecomp libkipi - +%define tde_pkg libkipi +%define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -15,7 +15,6 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -23,10 +22,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] -Version: 14.0.0 +Epoch: 1 +Version: 0.1.5 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -39,11 +39,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils %if 0%{?suse_version} BuildRequires: liblcms-devel @@ -75,7 +75,7 @@ Homepage: http://www.kipi-plugins.org/ %package devel Group: Development/Libraries Summary: library for apps that want to use kipi-plugins (development version) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Libkipi is a library @@ -93,7 +93,7 @@ Homepage: http://www.kipi-plugins.org/ %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -101,17 +101,24 @@ Homepage: http://www.kipi-plugins.org/ %build -unset QTDIR +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -121,7 +128,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean @@ -149,7 +156,7 @@ done /sbin/ldconfig || : -%files -f %{tdecomp}.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_libdir}/libkipi.so.0 %{tde_libdir}/libkipi.so.0.1.1 @@ -165,5 +172,5 @@ done %{tde_libdir}/pkgconfig/libkipi.pc %Changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +* Fri Jul 05 2013 Francois Andriot - 0.1.5-1 +- Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index c5d093478..fc7d16e66 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -1,5 +1,5 @@ # Default version for this component -%define tdecomp libksquirrel +%define tde_pkg libksquirrel %define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -16,7 +16,6 @@ %define tde_mandir %{tde_datadir}/man %define tde_appdir %{tde_datadsir}/applications -%define tde_tdeappdir %{tde_appdir}/kde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -24,9 +23,10 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Summary: Trinity image viewer -Version: 14.0.0 +Epoch: 1 +Version: 0.8.0 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -39,11 +39,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch0: libksquirrel-3.5.13-detect_netpbm.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -129,7 +129,7 @@ Runtime libraries for KSquirrel. %package devel Group: Development/Libraries Summary: Trinity image viewer -Requires: %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development libraries for KSquirrel. @@ -138,7 +138,7 @@ Development libraries for KSquirrel. %package tools Summary: Trinity image viewer Group: Environment/Libraries -Requires: %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description tools Tools for KSquirrel. @@ -150,7 +150,7 @@ Tools for KSquirrel. %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .netpbm %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -171,7 +171,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_includedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility \ + \ %{?with_djvu:--enable-djvu} %__make %{?_smp_mflags} @@ -498,5 +506,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +* Fri Jul 05 2013 Francois Andriot - 0.8.0-1 +- Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index c0cf78e18..47ca83b17 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -1,5 +1,5 @@ # Default version for this component -%define tdecomp libtdeldap +%define tde_pkg libtdeldap %define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -24,9 +24,9 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Summary: LDAP interface library for TDE -Version: 14.0.0 +Version: 0.5 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -39,11 +39,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch0: libtdeldap-14.0.0-ftbfs.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -54,8 +54,6 @@ BuildRequires: openldap-devel %description LDAP interface library for TDE management modules. -libtdeldap-trinity contains the library of libtdeldap. - %post /sbin/ldconfig || : @@ -101,7 +99,7 @@ libtdeldap-trinity-dev contains development files and documentation. ########## %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -122,7 +120,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -138,5 +143,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +* Fri Jul 05 2013 Francois Andriot - 0.5-1 +- Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec index 4f8c467ec..68048d7d9 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec @@ -1,5 +1,5 @@ # Default version for this component -%define tdecomp libtqt-perl +%define tde_pkg libtqt-perl %define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -24,7 +24,7 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Summary: Perl bindings for the TQt library Version: 3.008 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} @@ -42,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -119,7 +119,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ + --enable-rpath \ --enable-gcc-hidden-visibility %__make %{?_smp_mflags} diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index 6cb948967..ce65682ee 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -48,7 +48,7 @@ Patch2: pykdeextensions-3.5.13.2-fix_extra_module_dir.patch Patch5: pytdeextensions-14.0.0-fix_include_dir.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index 71d0d7a26..2953c3937 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -46,9 +46,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix include subdirectory 'tde' instead of 'kde' Patch1: python-trinity-14.0.0-tde_includedir.patch -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -123,8 +123,6 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -#export LDFLAGS="${LDFLAGS} -lpython2.7" - export DH_OPTIONS %__python configure.py \ @@ -169,5 +167,5 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Wed Jul 03 2013 Francois Andriot - 14.0.0-1 +* Fri Jul 05 2013 Francois Andriot - 3.16.3-1 - Initial release for TDE 14.0.0 -- cgit v1.2.1