RHEL/Fedora: updates libraries for MGA/MDV build

3 files changed, 168 insertions, 38 deletions

diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
new file mode 100644
index 000000000..40177c2e2
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
@@ -0,0 +1,31 @@
+--- pykdeextensions/src/kdedistutils.py.ori	2012-08-05 09:04:21.430039677 +0000
++++ pykdeextensions/src/kdedistutils.py	2012-08-05 09:04:33.013847354 +0000
+@@ -820,7 +820,7 @@
+             linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
+             linklist.append("-lm")
+-            linklist.append("-lstdc++")
++#            linklist.append("-lstdc++")
+             linklist.append("-lc")
+             linklist.append(self.clib)
+ 
+@@ -1734,7 +1734,7 @@
+             linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
+             linklist.append("-lm")
+-            linklist.append("-lstdc++")
++#            linklist.append("-lstdc++")
+             linklist.append("-lc")
+             linklist.append(self.clib)
+ 
+--- pykdeextensions/setup.py.ORI	2012-08-05 09:07:01.588332389 +0000
++++ pykdeextensions/setup.py	2012-08-05 09:07:07.795225579 +0000
+@@ -223,7 +223,7 @@
+         linklist.extend(sysconfig.get_config_var("LIBS").split())
+         
+         linklist.append("-lm")
+-        linklist.append("-lstdc++")
++#        linklist.append("-lstdc++")
+         linklist.append("-lc")
+         linklist.append(self.clib)
+ 
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
new file mode 100644
index 000000000..b7db0c21c
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
@@ -0,0 +1,53 @@
+commit 32d597f993f2566f7bdfec8a29c916b4c9b1a803
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1339639807 -0500
+
+    Reverse an old Debian-specific patch that prevents building on
+    some 64-bit systems. Add text to help with basic debugging.
+
+diff --git a/setup.py b/setup.py
+index e51f0fa..e7ec147 100755
+--- a/setup.py
++++ b/setup.py
+@@ -135,7 +135,7 @@ class BuildLibpythonize(Command):
+                     if self.clib!=None:
+                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
+             if self.clib is None:
+-                raise SystemExit, "Failed to find a suitable libgcc library"
++                raise SystemExit, "setup.py: Failed to find a suitable libgcc library"
+             self.announce("Using %s for clib" % self.clib)
+     
+             # Make a list of places to look for python .so modules
+diff --git a/src/kdedistutils.py b/src/kdedistutils.py
+index b8b3743..b8e23f3 100644
+--- a/src/kdedistutils.py
++++ b/src/kdedistutils.py
+@@ -660,7 +660,7 @@ class BuildKControlModule(Command):
+                     if self.clib!=None:
+                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
+             if self.clib is None:
+-                raise SystemExit, "Failed to find a suitable libgcc library"
++                raise SystemExit, "kdedistutils.py (1): Failed to find a suitable libgcc library"
+             self.announce("Using %s for clib" % self.clib)
+     
+             # Make a list of places to look for python .so modules
+@@ -1591,7 +1591,7 @@ class BuildKioslave(Command):
+                     if self.clib!=None:
+                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
+             if self.clib is None:
+-                raise SystemExit, "Failed to find a suitable libgcc library"
++                raise SystemExit, "kdedistutils.py (2): Failed to find a suitable libgcc library"
+             self.announce("Using %s for clib" % self.clib)
+     
+             # Make a list of places to look for python .so modules
+@@ -2229,7 +2229,7 @@ def compile_qtdesigner(ui_files,
+ 
+ ###########################################################################
+ def get_libdir_name():
+-    #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
+-    #    return 'lib64'
+-    #else:
++    if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
++        return 'lib64'
++    else:
+         return 'lib'
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
index 9a6a44d8c..1ecd8085a 100644
--- a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
@@ -1,20 +1,30 @@
 %{!?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"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
 
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:		trinity-pykdeextensions
-Summary:	Python packages to support KDE applications (scripts) [Trinity]
+%define _docdir %{tde_docdir}
+
+
+
+Name:		trinity-pytdeextensions
+Summary:	Python packages to support TDE applications (scripts) [Trinity]
 Version:	0.4.0
 Release:	2%{?dist}%{?_variant}
 
@@ -25,28 +35,47 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.simonzone.com/software/pykdeextensions
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
+# [pykdeextensions] Reverse an old Debian-specific patch that prevents building on
+#    some 64-bit systems. Add text to help with basic debugging. [Commit #32d597f9]
+Patch3:		pykdeextensions-3.5.13-fix_libsuffix.patch
+# [pykdeextensions] Do not link with stdc++
+Patch4:		pykdeextensions-3.5.13-do_not_link_stdc++.patch
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	python-trinity-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	python-qt
+%else
 %if 0%{?rhel} == 5
 BuildRequires:	trinity-PyQt-devel
 %else
 BuildRequires:	PyQt-devel
 %endif
+%endif
+
+Requires:		trinity-libpythonize0 = %{version}-%{release}
+
+Obsoletes:		trinity-pykdeextensions < %{version}-%{release}
+Provides:		trinity-pykdeextensions = %{version}-%{release}
+
 
 %description
 PyKDE Extensions is a collection of software and Python packages
@@ -67,7 +96,7 @@ This package contains the libpythonize library files.
 %package -n trinity-libpythonize0-devel
 Summary:		Python packages to support KDE applications (development) [Trinity]
 Group:			Development/Libraries
-Requires:		trinity-libpythonize0
+Requires:		trinity-libpythonize0 = %{version}-%{release}
 
 %description -n trinity-libpythonize0-devel
 PyKDE Extensions is a collection of software and Python packages
@@ -80,42 +109,49 @@ This package contains the libpythonize development files.
 %setup -q -n libraries/pykdeextensions
 %patch1 -p1 -b .libtool
 %patch2 -p1 -b .extramodule
+%patch3 -p1 -b .libsuffix
+%patch4 -p1 -b .stdc++
 
 # Changes library directory to 'lib64'
 for f in src/*.py; do
   %__sed -i "${f}" \
-    -e "s|%{_prefix}/lib/|%{_libdir}/|g" \
+    -e "s|%{tde_prefix}/lib/|%{tde_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"
+    -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
 done
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_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 PATH="%{tde_bindir}:${PATH}"
 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
 
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
 %__rm -rf %{buildroot}
+
+
 ./setup.py install \
 	--root=%{buildroot} \
-	--prefix=%{_prefix} \
-	--install-clib=%{_libdir} \
-	--install-cheaders=%{tde_includedir}
+	--prefix=%{tde_prefix} \
+	--install-clib=%{tde_libdir} \
+	--install-cheaders=%{tde_tdeincludedir}
 
 # Removes BUILDROOT directory reference in installed files
 for f in \
-	%{buildroot}%{_libdir}/libpythonize.la \
-	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
-	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
+	%{buildroot}%{tde_libdir}/libpythonize.la \
+	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
+	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
 ; do
 	%__sed -i "${f}" -e "s|%{buildroot}||g"
 :
@@ -123,44 +159,54 @@ 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/python*/site-packages
+%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
+%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
+
+# Removes useless files
+%__rm -rf %{?buildroot}%{tde_libdir}/*.a
 
+# Fix permissions on include files
+%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post -n trinity-libpythonize0 -p /sbin/ldconfig
-%postun -n trinity-libpythonize0 -p /sbin/ldconfig
+%post -n trinity-libpythonize0
+/sbin/ldconfig
+
+%postun -n trinity-libpythonize0
+/sbin/ldconfig
+
+%post -n trinity-libpythonize0-devel
+/sbin/ldconfig
 
-%post -n trinity-libpythonize0-devel -p /sbin/ldconfig
-%postun -n trinity-libpythonize0-devel -p /sbin/ldconfig
+%postun -n trinity-libpythonize0-devel
+/sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_datadir}/apps/pykdeextensions
-%{tde_docdir}/HTML/en/pykdeextensions
+%{tde_datadir}/apps/pykdeextensions
+%{tde_tdedocdir}/HTML/en/pykdeextensions
 %{python_sitearch}/*
 
 %files -n trinity-libpythonize0
 %defattr(-,root,root,-)
-%{_libdir}/libpythonize.so.*
+%{tde_libdir}/libpythonize.so.*
 
 %files -n trinity-libpythonize0-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{_libdir}/libpythonize.a
-%{_libdir}/libpythonize.la
-%{_libdir}/libpythonize.so
+%{tde_tdeincludedir}/*.h
+%{tde_libdir}/libpythonize.la
+%{tde_libdir}/libpythonize.so
 
 
 %Changelog
-* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
+* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-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
+* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16