RHEL/Fedora: various updates

5 files changed, 100 insertions, 25 deletions

diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
new file mode 100644
index 000000000..3b89e2422
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
@@ -0,0 +1,19 @@
+--- pykdeextensions/src/kdedistutils.py.libtool	2012-05-11 23:45:11.738618661 +0200
++++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:46:11.469447204 +0200
+@@ -712,6 +712,7 @@
+             
+             # Build the 'stub' code.
+             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
++                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
+                                             "modulename": modulename,
+                                             "factoryfunction": factoryfunction,
+                                             "python_version": python_version}
+@@ -855,7 +856,7 @@
+ #include <sip.h>
+ 
+ #define MODULE_DIR "%(moduledir)s"
+-#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
++#define EXTRA_MODULE_DIR "%(extramodule)s"
+ #define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
+ #define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
+ #define MODULE_NAME "%(modulename)s"
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
new file mode 100644
index 000000000..44c50bd06
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
@@ -0,0 +1,20 @@
+--- pykdeextensions/src/kdedistutils.py.libtool	2011-08-21 23:01:12.000000000 +0200
++++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:41:07.326232457 +0200
+@@ -790,6 +791,8 @@
+             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
+             # link_flags
+             cmdlist.append("-module")
++            cmdlist.append("-avoid-version")
++            cmdlist.append("-shared")
+             cmdlist.append("-export-dynamic")
+             # object
+             cmdlist.append(outputfile)
+@@ -1703,6 +1705,8 @@
+             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
+             # link_flags
+             cmdlist.append("-module")
++            cmdlist.append("-avoid-version")
++            cmdlist.append("-shared")
+             cmdlist.append("-export-dynamic")
+             # object
+             cmdlist.append(outputfile)
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
index dd0ad0c51..9a6a44d8c 100644
--- a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
@@ -1,12 +1,9 @@
-# Default version for this component
-%define kdecomp pykdeextensions
-%define version 0.4.0
-%define release 1
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -16,10 +13,10 @@ BuildRequires: autoconf automake libtool m4
 %define tde_libdir %{_libdir}/trinity
 
 
-Name:		trinity-%{kdecomp}
+Name:		trinity-pykdeextensions
 Summary:	Python packages to support KDE applications (scripts) [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -31,7 +28,12 @@ URL:		http://www.simonzone.com/software/pykdeextensions
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{kdecomp}-3.5.13.tar.gz
+Source0:	pykdeextensions-3.5.13.tar.gz
+
+# [pykdeextensions] Fix KCM modules versioning [Bug #999]
+Patch1:		pykdeextensions-3.5.13-fix_libtool.patch
+# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
+Patch2:		pykdeextensions-3.5.13-fix_extra_module_dir.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -39,8 +41,12 @@ BuildRequires:	trinity-kdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	PyQt-devel
 BuildRequires:	python-trinity-devel
+%if 0%{?rhel} == 5
+BuildRequires:	trinity-PyQt-devel
+%else
+BuildRequires:	PyQt-devel
+%endif
 
 %description
 PyKDE Extensions is a collection of software and Python packages
@@ -71,26 +77,33 @@ This package contains the libpythonize development files.
 
 
 %prep
-%setup -q -n libraries/%{kdecomp}
+%setup -q -n libraries/pykdeextensions
+%patch1 -p1 -b .libtool
+%patch2 -p1 -b .extramodule
 
 # Changes library directory to 'lib64'
 for f in src/*.py; do
   %__sed -i "${f}" \
-    -e "s,%{_prefix}/lib,%{_libdir},g" \
-    -e "s,/usr/lib/pyshared/python2.6,%{python_sitearch},g" \
+    -e "s|%{_prefix}/lib/|%{_libdir}/|g" \
+    -e "s|/usr/lib/pyshared/python2.6|%{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|%{_includedir}/tqt|g"
 done
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
 
 ./setup.py build_libpythonize
 
 %install
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+
 %__rm -rf %{buildroot}
 ./setup.py install \
 	--root=%{buildroot} \
@@ -104,14 +117,14 @@ for f in \
 	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
 	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
 ; do
-	%__sed -i "${f}" -e "s,%{buildroot},,g"
+	%__sed -i "${f}" -e "s|%{buildroot}||g"
 :
 done
 
 # Moves PYTHON libraries to distribution directory
 %__mkdir_p %{buildroot}%{python_sitearch}
 %__mv -f %{buildroot}%{_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{_prefix}/lib/python2.7/site-packages
+%__rm -rf %{buildroot}%{_prefix}/lib/python*/site-packages
 
 
 %clean
@@ -145,5 +158,9 @@ done
 
 
 %Changelog
+* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
+- Fix KCM modules versioning [Bug #999]
+- Fix hardcoded path to Guidance python libraries [Bug #999]
+
 * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch
new file mode 100644
index 000000000..dd2877616
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch
@@ -0,0 +1,11 @@
+--- python-trinity/configure.py.ORI	2012-05-12 10:52:21.457246722 +0200
++++ python-trinity/configure.py	2012-05-12 10:52:43.558700741 +0200
+@@ -74,7 +74,7 @@
+ kde_version_extra  = None
+ kde_max_version    = 0x030503
+ 
+-sip_min_v4_version = 0x040900
++sip_min_v4_version = 0x040400
+ qt_min_version     = 0x030200
+ pyqt_min_version   = 0x031000
+ 
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
index 0a1adfc82..0adf450ff 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -1,12 +1,9 @@
-# Default version for this component
-%define kdecomp python-trinity
-%define version 3.16.3
-%define release 2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -16,10 +13,10 @@ BuildRequires: autoconf automake libtool m4
 %define tde_libdir %{_libdir}/trinity
 
 
-Name:		%{kdecomp}
+Name:		python-trinity
 Summary:	Trinity bindings for Python [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.16.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -31,7 +28,7 @@ URL:		http://www.simonzone.com/software/pykdeextensions
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{kdecomp}-3.5.13.tar.gz
+Source0:	python-trinity-3.5.13.tar.gz
 
 ## RHEL/Fedora patches
 Patch1:		python-trinity-3.5.13-install_directories.patch
@@ -46,7 +43,14 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	python
+
+%if 0%{?rhel} == 5
+BuildRequires:	trinity-sip-devel
+BuildRequires:	trinity-PyQt-devel
+%else
+BuildRequires:	sip-devel
 BuildRequires:	PyQt-devel
+%endif
 
 
 %description
@@ -77,7 +81,7 @@ tips and working code you can use to learn from.
 
 
 %prep
-%setup -q -n libraries/%{kdecomp}
+%setup -q -n libraries/python-trinity
 %patch1 -p1
 %patch2 -p1
 
@@ -89,10 +93,13 @@ tips and working code you can use to learn from.
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+
 %__python configure.py \
 	-k %{_prefix} \
 	-L %{_lib} \
 	-v %{_datadir}/sip/trinity
+
 %__make %{_smp_mflags}
 
 %install
@@ -132,6 +139,7 @@ export PATH="%{_bindir}:${PATH}"
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
 - Rebuild for Fedora 17
 - Fix compilation with GCC 4.7
+- Fix compilation for RHEL 5
  
 * Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16