diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 14:34:02 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 22:29:41 +0100 |
commit | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch) | |
tree | 85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/libraries/pytdeextensions | |
parent | 87e57a1a070839a44db16a0410ef57902db2df3e (diff) | |
download | tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip |
RPM: massive update and cleanup
Diffstat (limited to 'redhat/libraries/pytdeextensions')
-rw-r--r-- | redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch | 41 | ||||
-rw-r--r-- | redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch | 11 | ||||
-rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec | 225 | ||||
-rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions.spec (renamed from redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec) | 32 |
4 files changed, 27 insertions, 282 deletions
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch deleted file mode 100644 index e02d15f98..000000000 --- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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,8 @@ - - # Build the 'stub' code. - cppcode = self.cpptemplate % {"moduledir": self.data_dir, -+ "extramodule": os.getenv("EXTRA_MODULE_DIR"), -+ "pyqt_dir": self.pyqt_dir, - "modulename": modulename, - "factoryfunction": factoryfunction, - "python_version": python_version} -@@ -854,6 +856,8 @@ - #include <sip.h> - - #define MODULE_DIR "%(moduledir)s" -+#define EXTRA_MODULE_DIR "%(extramodule)s" -+#define PYQT_DIR "%(pyqt_dir)s" - #define MODULE_NAME "%(modulename)s" - #define FACTORY "%(factoryfunction)s" - #define CPP_FACTORY %(factoryfunction)s ---- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI 2013-04-07 17:54:28.531813437 +0200 -+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2013-04-07 17:56:15.510529614 +0200 -@@ -903,6 +906,18 @@ - if(!pyize->appendToSysPath (path.latin1 ())) { - return report_error ("***Failed to set sys.path\n"); - } -+ -+ // Add the extra path to the python script to the interpreter search path. -+ TQString extrapath = TQString(EXTRA_MODULE_DIR); -+ if(!pyize->appendToSysPath (extrapath.latin1 ())) { -+ return report_error ("***Failed to set extra sys.path\n"); -+ } -+ -+ // Add the PYQT path to the python script to the interpreter search path. -+ TQString pyqt_dir = TQString(PYQT_DIR); -+ if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) { -+ return report_error ("***Failed to set PYQT sys.path\n"); -+ } - - // Load the Python script. - PyObject *pyModule = pyize->importModule ((char *)script.latin1 ()); diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch deleted file mode 100644 index 2d6863f65..000000000 --- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/tde') - 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/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec deleted file mode 100644 index 069af8cec..000000000 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ /dev/null @@ -1,225 +0,0 @@ -%{!?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 - -# TDE 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: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -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: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999] -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 >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# Python stuff -BuildRequires: python-qt3-devel -BuildRequires: trinity-python-trinity-devel - -Requires: trinity-libpythonize0 = %{version}-%{release} - -Obsoletes: trinity-pykdeextensions < %{version}-%{release} -Provides: trinity-pykdeextensions = %{version}-%{release} - - -%description -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 -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] -Group: Development/Libraries -Requires: trinity-libpythonize0 = %{version}-%{release} - -%description -n trinity-libpythonize0-devel -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}-%{tde_version}%{?preversion:~%{preversion}} -%patch2 -p1 -b .extramodule -%patch5 -p1 -b .incdir - -# Changes library directory to 'lib64' -# Also other fixes for distributions ... -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|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \ - -e 's|"/kde"|"/tde"|' -done - -# Do not look for 'libpython2.x.so' (from -devel) package. -# Instead look for versioned runtime library. -LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)" -if [ -f "%{_libdir}/${LIBPYTHON}" ]; then - %__sed -i "src/kdedistutils.py" \ - -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|" -fi - -# Set PyQt directory to actual directory -%__sed -i "src/kdedistutils.py" \ - -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/python-qt3'|g" \ - -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/python-qt3\"|g" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -%__mkdir_p build -./setup.py build_libpythonize - -%install -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -# 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} \ - -v - -# 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} - - -%changelog diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 88888da02..e6c806fac 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -15,12 +15,10 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity @@ -76,6 +74,18 @@ Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release} @@ -185,13 +195,25 @@ fi %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" %endif +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "app_templates/kcontrol_module/setup.py" \ + "app_templates/kcontrol_module/src/kcontrol_module.py" \ + "app_templates/kdeapp/setup.py" \ + "app_templates/kdeapp/src/kdeapp.py" \ + "app_templates/kdeutility/setup.py" \ + "app_templates/kdeutility/src/kdeutility.py" \ + "app_templates/tdeioslave/setup.py" \ + "app_templates/tdeioslave/src/tdeioslave.py" \ + -e "s|/usr/bin/python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" %__mkdir_p build -./setup.py build_libpythonize +%__python ./setup.py build_libpythonize %install @@ -203,7 +225,7 @@ export PYTHONDONTWRITEBYTECODE= %__rm -rf %{buildroot} -./setup.py install \ +%__python ./setup.py install \ --root=%{buildroot} \ --prefix=%{tde_prefix} \ --install-clib=%{tde_libdir} \ |