From 3981ced036cda6b6a52203f600990c360571d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 17 Aug 2013 23:16:27 +0200 Subject: RPM Packaging: update packages for 3.5.13.2 under Fedora 19 --- redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec | 57 +++++----- redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec | 50 +++++---- redhat/libraries/libkipi/libkipi-3.5.13.2.spec | 59 +++++----- .../libksquirrel/libksquirrel-3.5.13.2.spec | 55 ++++++---- .../pytdeextensions/pytdeextensions-3.5.13.2.spec | 119 ++++++++++++--------- .../python-trinity/python-trinity-3.5.13.2.spec | 64 ++++++----- 6 files changed, 224 insertions(+), 180 deletions(-) (limited to 'redhat/libraries') diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec index d42c6ef8c..56c706a00 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libkdcraw +%define tde_pkg libkdcraw +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +23,12 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Raw picture decoding C++ library (runtime) [Trinity] -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.9 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,11 +40,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.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,13 +88,7 @@ library documentation is available on kdcraw.h header file. %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%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" @@ -102,16 +98,20 @@ library documentation is available on kdcraw.h header file. %build unset QTDIR || : ; source /etc/profile.d/qt3.sh 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 \ - --with-extra-includes=%{tde_includedir}/tqt + --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 %__make %{?_smp_mflags} @@ -121,7 +121,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 @@ -154,7 +154,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 @@ -168,5 +168,8 @@ done %{tde_libdir}/pkgconfig/libkdcraw.pc %Changelog +* Fri Aug 16 2013 Francois Andriot - 1:0.1.9-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec index 2aa947dc4..03e4966ac 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libkexiv2 +%define tde_pkg libkexiv2 +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +23,12 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.7 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,11 +40,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.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 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,13 +89,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%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" @@ -106,12 +102,17 @@ 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 \ - --with-extra-includes=%{tde_includedir}/tqt + --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 %__make %{?_smp_mflags} @@ -157,5 +158,8 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog +* Fri Aug 16 2013 Francois Andriot - 0.1.7-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec index 45ede0c38..156064992 100644 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec @@ -1,13 +1,13 @@ # Default version for this component -%define tdecomp libkipi - +%define tde_pkg libkipi +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -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,11 +22,12 @@ %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: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.1.5 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -39,11 +39,11 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.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,13 +93,7 @@ Homepage: http://www.kipi-plugins.org/ %prep -%setup -q - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%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" @@ -109,16 +103,20 @@ Homepage: http://www.kipi-plugins.org/ %build unset QTDIR || : ; source /etc/profile.d/qt3.sh 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 \ - --with-extra-includes=%{tde_includedir}/tqt + --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 %__make %{?_smp_mflags} @@ -128,7 +126,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tdecomp} +%find_lang %{tde_pkg} %clean @@ -156,7 +154,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 @@ -172,5 +170,8 @@ done %{tde_libdir}/pkgconfig/libkipi.pc %Changelog +* Fri Aug 16 2013 Francois Andriot - 0.1.5-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index 86943b89e..2d3f5691e 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp libksquirrel +%define tde_pkg libksquirrel +%define tde_version 3.5.13.2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -15,7 +16,6 @@ %define tde_mandir %{tde_datadir}/man %define tde_appdir %{tde_datadir}/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 @@ -23,10 +23,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Trinity image viewer -Version: 3.5.13.2 -Release: 1%{?dist}%{?_variant} +Epoch: 1 +Version: 0.8.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -38,12 +39,12 @@ URL: http://www.trinitydesktop.org/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch0: libksquirrel-3.5.13-detect_netpbm.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 @@ -78,6 +79,9 @@ BuildRequires: xmedcon-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif +%if 0%{?fedora} +BuildRequires: librsvg2-tools +%endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: librsvg %endif @@ -128,7 +132,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. @@ -137,7 +141,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. @@ -149,15 +153,9 @@ Tools for KSquirrel. %prep -%setup -q +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .netpbm -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - %__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" %__make -f "admin/Makefile.common" @@ -176,8 +174,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_includedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ %{?with_djvu:--enable-djvu} %__make %{?_smp_mflags} @@ -199,6 +203,12 @@ export PATH="%{tde_bindir}:${PATH}" %postun /sbin/ldconfig || : +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + %files %defattr(-,root,root,-) @@ -498,5 +508,8 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog +* Fri Aug 16 2013 Francois Andriot - 0.8.0-1 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec index a63006a52..2ba4b2fe6 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec @@ -1,11 +1,13 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define tde_version 3.5.13.2 + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -22,11 +24,10 @@ %define _docdir %{tde_docdir} - Name: trinity-pytdeextensions Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 -Release: 4%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -38,9 +39,7 @@ URL: http://www.simonzone.com/software/pykdeextensions Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz - - +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999] @@ -48,9 +47,9 @@ Patch2: pykdeextensions-3.5.13.2-fix_extra_module_dir.patch # [pykdeextensions] Fix include directory search location Patch5: pykdeextensions-3.5.13.2-fix_include_dir.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 @@ -73,20 +72,40 @@ Provides: trinity-pykdeextensions = %{version}-%{release} %description -PyKDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. +PyTDE Extensions is a collection of software and Python packages +to support the creation and installation of TDE applications. + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_datadir}/apps/pykdeextensions/ +%{tde_tdedocdir}/HTML/en/pykdeextensions/ +%{python_sitearch}/* +########## %package -n trinity-libpythonize0 Summary: Python packages to support KDE applications (library) [Trinity] Group: Environment/Libraries %description -n trinity-libpythonize0 -PyKDE Extensions is a collection of software and Python packages +PyTDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. This package contains the libpythonize library files. +%post -n trinity-libpythonize0 +/sbin/ldconfig + +%postun -n trinity-libpythonize0 +/sbin/ldconfig + +%files -n trinity-libpythonize0 +%defattr(-,root,root,-) +%{tde_libdir}/libpythonize.so.* + +########## %package -n trinity-libpythonize0-devel Summary: Python packages to support KDE applications (development) [Trinity] @@ -94,19 +113,46 @@ Group: Development/Libraries Requires: trinity-libpythonize0 = %{version}-%{release} %description -n trinity-libpythonize0-devel -PyKDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. +PyTDE Extensions is a collection of software and Python packages +to support the creation and installation of TDE applications. This package contains the libpythonize development files. +%post -n trinity-libpythonize0-devel +/sbin/ldconfig + +%postun -n trinity-libpythonize0-devel +/sbin/ldconfig + +%files -n trinity-libpythonize0-devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_libdir}/libpythonize.la +%{tde_libdir}/libpythonize.so + +########## + +%package devel +Summary: Meta-package to install all pytdeextensions development files +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: trinity-libpythonize0-devel = %{version}-%{release} + +%description devel +%{summary} + +%files devel + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch2 -p1 -b .extramodule %patch5 -p1 -b .incdir @@ -118,13 +164,12 @@ for f in src/*.py; do -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \ -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \ -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \ -e 's|"/kde"|"/tde"|' done # Do not look for 'libpython2.x.so' (from -devel) package. -# Instead look for runtime library. +# Instead look for versioned runtime library. LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)" if [ -f "%{_libdir}/${LIBPYTHON}" ]; then %__sed -i "src/kdedistutils.py" \ @@ -140,9 +185,7 @@ fi %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export KDEDIR="%{tde_prefix}" %__mkdir_p build ./setup.py build_libpythonize @@ -161,7 +204,8 @@ export PYTHONDONTWRITEBYTECODE= --root=%{buildroot} \ --prefix=%{tde_prefix} \ --install-clib=%{tde_libdir} \ - --install-cheaders=%{tde_tdeincludedir} + --install-cheaders=%{tde_tdeincludedir} \ + -v # Removes BUILDROOT directory reference in installed files for f in \ @@ -184,42 +228,15 @@ done # Fix permissions on include files %__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h + %clean %__rm -rf %{buildroot} -%post -n trinity-libpythonize0 -/sbin/ldconfig - -%postun -n trinity-libpythonize0 -/sbin/ldconfig - -%post -n trinity-libpythonize0-devel -/sbin/ldconfig - -%postun -n trinity-libpythonize0-devel -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_datadir}/apps/pykdeextensions -%{tde_tdedocdir}/HTML/en/pykdeextensions -%{python_sitearch}/* - -%files -n trinity-libpythonize0 -%defattr(-,root,root,-) -%{tde_libdir}/libpythonize.so.* - -%files -n trinity-libpythonize0-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libpythonize.la -%{tde_libdir}/libpythonize.so - - %changelog +* Fri Aug 16 2013 Francois Andriot - 0.4.0-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 0.4.0-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec index 863d09e58..3237c399f 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec @@ -4,8 +4,9 @@ %if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif +%define tde_version 3.5.13.2 -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,50 +28,59 @@ Name: trinity-python-trinity Summary: Trinity bindings for Python [Trinity] Version: 3.16.3 -Release: 4%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities Vendor: Trinity Project Packager: Francois Andriot -URL: http://www.simonzone.com/software/pykdeextensions +#URL: http://www.simonzone.com/software/pykdeextensions +URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix include subdirectory 'tde' instead of 'kde' Patch1: python-trinity-3.5.13.2-fix_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 +# PYTHON support BuildRequires: python - %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 # RHEL 4/5 comes with old version, so we brought ours ... -BuildRequires: trinity-sip-devel BuildRequires: trinity-PyQt-devel %endif - %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip BuildRequires: python-qt %endif - %if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel BuildRequires: PyQt-devel %endif +%if 0%{?suse_version} +BuildRequires: trinity-PyQt-devel +%endif +# SIP support +%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 +# RHEL 4/5 comes with old version, so we brought ours ... +BuildRequires: trinity-sip-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: sip-devel +%endif %if 0%{?suse_version} BuildRequires: python-sip-devel -BuildRequires: trinity-PyQt-devel %endif Obsoletes: python-trinity < %{version}-%{release} @@ -91,7 +101,7 @@ Obsoletes: python-trinity-devel < %{version}-%{release} Provides: python-trinity-devel = %{version}-%{release} %description devel -Development .sip files with definitions of PyKDE classes. They +Development .sip files with definitions of PyTDE classes. They are needed to build PyTDE, but also as building blocks of other packages based on them. The package also contains kdepyuic, a wrapper script around PyQt's @@ -99,14 +109,14 @@ user interface compiler. %package doc -Summary: Documentation and examples for PyKDE [Trinity] +Summary: Documentation and examples for PyTDE [Trinity] Group: Development/Libraries Obsoletes: python-trinity-doc < %{version}-%{release} Provides: python-trinity-doc = %{version}-%{release} %description doc -General documentation and examples for PyKDE providing programming +General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. @@ -116,24 +126,17 @@ tips and working code you can use to learn from. %prep -%setup -q -n %{name}-3.5.13.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .inc -# Hack to get TQT include files under /opt -%__sed -i "configure.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export LD_RUN_PATH="%{tde_libdir}" export KDEDIR=%{tde_prefix} -#export LDFLAGS="${LDFLAGS} -lpython2.7" - export DH_OPTIONS -export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt @@ -189,7 +192,10 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 +* Fri Aug 16 2013 Francois Andriot - 3.6.13-5 +- Build for Fedora 19 + +* Mon Jun 03 2013 Francois Andriot - 3.16.3-4 - Initial release for TDE 3.5.13.2 * Tue Oct 02 2012 Francois Andriot - 3.16.3-3 -- cgit v1.2.3