RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 68 insertions, 51 deletions

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 <[email protected]> - 0.4.0-5
+- Build for Fedora 19
+
 * Mon Jun 03 2013 Francois Andriot <[email protected]> - 0.4.0-4
 - Initial release for TDE 3.5.13.2