RHEL/Fedora/MGA/MDV/Suse: update main and libraries for TDE 3.5.13.1

5 files changed, 303 insertions, 0 deletions

diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
new file mode 100644
index 000000000..05ac80b79
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
@@ -0,0 +1,11 @@
+--- pykdeextensions/src/kdedistutils.py.ORI	2012-08-27 22:10:18.873738368 +0200
++++ pykdeextensions/src/kdedistutils.py	2012-08-27 22:10:50.234094262 +0200
+@@ -539,7 +539,7 @@
+                     canidatepaths.append(os.path.join(kdedir,"include"))
+                 canidatepaths.append(os.path.join(install.prefix,"include"))
+                 canidatepaths.append('/opt/trinity/include')
+-                canidatepaths.append('/opt/kde/include')
++                canidatepaths.append('/opt/trinity/include/kde')
+                 self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
+             if self.kde_inc_dir is None:
+                 raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
new file mode 100644
index 000000000..2a1cfee6c
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
@@ -0,0 +1,18 @@
+--- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule	2012-09-08 17:33:05.000000000 +0000
++++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-02 19:19:40.185384207 +0000
+@@ -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}
+@@ -854,6 +855,7 @@
+ #include <sip.h>
+ 
+ #define MODULE_DIR "%(moduledir)s"
++#define EXTRA_MODULE_DIR "%(extramodule)s"
+ #define MODULE_NAME "%(modulename)s"
+ #define FACTORY "%(factoryfunction)s"
+ #define CPP_FACTORY %(factoryfunction)s
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
new file mode 100644
index 000000000..720b8bdc3
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
@@ -0,0 +1,62 @@
+--- pykdeextensions-3.5.13.1/setup.py.libgcc	2012-09-08 11:59:03.000000000 +0200
++++ pykdeextensions-3.5.13.1/setup.py	2012-10-06 12:52:03.768762713 +0200
+@@ -126,7 +126,7 @@
+                 
+             # Find the C library (libgcc, libgcc_s or some other variation).
+             if self.clib is None:
+-                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ]
++                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ]
+                 self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths)
+                 if self.clib!=None:
+                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
+--- pykdeextensions-3.5.13.1/src/kdedistutils.py.libgcc	2012-10-06 13:29:31.920413352 +0200
++++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-06 13:31:23.440538658 +0200
+@@ -564,6 +564,9 @@
+             # Qt inc dir
+             if self.qt_inc_dir is None:
+                 canidatepaths = []
++                qtinc = os.getenv("QTINC")
++                if qtinc != None:
++                    canidatepaths.append(qtinc)
+                 qtdir = os.getenv("QTDIR")
+                 if qtdir != None:
+                     canidatepaths.append(os.path.join(qtdir,"include"))
+@@ -585,6 +588,9 @@
+             # Qt lib dir
+             if self.qt_lib_dir is None:
+                 canidatepaths = []
++                qtlib = os.getenv("QTLIB")
++                if qtlib != None:
++                    canidatepaths.append(qtlib)
+                 qtdir = os.getenv("QTDIR")
+                 if qtdir != None:
+                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
+@@ -634,7 +640,7 @@
+                 
+             # Find the C library (libgcc, libgcc_s or some other variation).
+             if self.clib is None:
+-                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
++                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
+                 self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
+                 if self.clib!=None:
+                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
+@@ -1481,6 +1487,9 @@
+             # Qt inc dir
+             if self.qt_inc_dir is None:
+                 canidatepaths = []
++                qtinc = os.getenv("QTINC")
++                if qtinc != None:
++                    canidatepaths.append(qtinc)
+                 qtdir = os.getenv("QTDIR")
+                 if qtdir != None:
+                     canidatepaths.append(os.path.join(qtdir,"include"))
+@@ -1501,6 +1510,9 @@
+             # Qt lib dir
+             if self.qt_lib_dir is None:
+                 canidatepaths = []
++                qtlib = os.getenv("QTLIB")
++                if qtlib != None:
++                    canidatepaths.append(qtlib)
+                 qtdir = os.getenv("QTDIR")
+                 if qtdir != None:
+                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.1.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.1.spec
new file mode 100644
index 000000000..1f8110b55
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.1.spec
@@ -0,0 +1,209 @@
+%{!?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 "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%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}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+
+Name:		trinity-pytdeextensions
+Summary:	Python packages to support TDE applications (scripts) [Trinity]
+Version:	0.4.0
+Release:	3%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.simonzone.com/software/pykdeextensions
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	pykdeextensions-3.5.13.1.tar.gz
+
+
+
+
+# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
+Patch2:		pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
+# [pykdeextensions] Fix include directory search location
+Patch5:		pykdeextensions-3.5.13-fix_include_dir.patch
+# [pykdeextensions] Fix 'libgcc' search location
+Patch6:		pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
+
+BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
+BuildRequires: trinity-arts-devel >= 3.5.13.1
+BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	python-trinity-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	python-qt
+%else
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+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
+to support the creation and installation of KDE applications.
+
+
+%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
+to support the creation and installation of KDE applications.
+
+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 = %{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.
+
+This package contains the libpythonize development files.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n pykdeextensions-3.5.13.1
+%patch2 -p1 -b .extramodule
+%patch5 -p1 -b .incdir
+%patch6 -p1 -b .libgcc
+
+# Changes library directory to 'lib64'
+for f in src/*.py; do
+  %__sed -i "${f}" \
+    -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
+    -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"
+done
+
+%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
+
+%__mkdir_p build
+./setup.py build_libpythonize
+
+%install
+unset QTDIR; . /etc/profile.d/qt3.sh
+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=%{tde_prefix} \
+	--install-clib=%{tde_libdir} \
+	--install-cheaders=%{tde_tdeincludedir}
+
+# Removes BUILDROOT directory reference in installed files
+for f in \
+	%{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"
+:
+done
+
+# Moves PYTHON libraries to distribution directory
+%__mkdir_p %{buildroot}%{python_sitearch}
+%__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
+/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
+* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.spec
index 1ecd8085a..18de0507e 100644
--- a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.spec
@@ -52,6 +52,8 @@ Patch2:		pykdeextensions-3.5.13-fix_extra_module_dir.patch
 Patch3:		pykdeextensions-3.5.13-fix_libsuffix.patch
 # [pykdeextensions] Do not link with stdc++
 Patch4:		pykdeextensions-3.5.13-do_not_link_stdc++.patch
+# [pykdeextensions] Fix include directory search location
+Patch5:		pykdeextensions-3.5.13-fix_include_dir.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-tdelibs-devel
@@ -111,6 +113,7 @@ This package contains the libpythonize development files.
 %patch2 -p1 -b .extramodule
 %patch3 -p1 -b .libsuffix
 %patch4 -p1 -b .stdc++
+%patch5 -p1 -b .incdir
 
 # Changes library directory to 'lib64'
 for f in src/*.py; do