From dff7a54b072909fa4966830722e362d12d09623e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 8 Apr 2023 13:42:27 +0200 Subject: RPM: rename python-trinity to pytde --- .../settings/tde-guidance/tde-guidance.spec | 6 +- redhat/libraries/pytde/pytde.spec | 190 +++++++++++++++++++++ .../libraries/pytdeextensions/pytdeextensions.spec | 4 +- .../libraries/python-trinity/python-trinity.spec | 184 -------------------- 4 files changed, 195 insertions(+), 189 deletions(-) create mode 100644 redhat/libraries/pytde/pytde.spec delete mode 100644 redhat/libraries/python-trinity/python-trinity.spec diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 344c9c432..b4193b7e0 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel -BuildRequires: trinity-python-trinity +BuildRequires: trinity-pytde BuildRequires: chrpath BuildRequires: autoconf automake libtool m4 @@ -89,7 +89,7 @@ Requires: sip4-tqt >= 4.10.5 # PYTHON-QT support BuildRequires: pytqt-devel -BuildRequires: trinity-python-trinity-devel +BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools # LIBXXF86VM support @@ -155,7 +155,7 @@ BuildRequires: %{python} BuildRequires: %{python}-devel Requires: pytqt -Requires: trinity-python-trinity +Requires: trinity-pytde Requires: trinity-pytdeextensions %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec new file mode 100644 index 000000000..03a1cbdd6 --- /dev/null +++ b/redhat/libraries/pytde/pytde.spec @@ -0,0 +1,190 @@ +# +# spec file for package pytde (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg pytde +%define tde_prefix /opt/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_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 3.16.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity bindings for Python +Group: Development/Libraries/Python +URL: http://www.trinitydesktop.org/ +#URL: http://www.simonzone.com/software/pykdeextensions + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%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 + +BuildRequires: pytqt-devel +Requires: pytqt + +# SIP +BuildRequires: sip4-tqt-devel >= 4.10.5 +Requires: sip4-tqt >= 4.10.5 + +Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release} + +%description +Python binding module that provides wide access to the Trinity API, +also known as PyTDE. Using this, you'll get (for example) classes +from tdeio, tdejs, tdehtml and tdeprint. + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{python_sitearch}/*.so +%{python_sitearch}/dcop*.py* +%{python_sitearch}/pytde*.py* + +########## + +%package devel +Summary: Trinity bindings for Python - Development files and scripts +Group: Development/Libraries/Python +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel +Development .sip files with definitions of PyTDE classes. They +are needed to build PyTDE, but also as building blocks of other +packages based on them. +The package also contains kdepyuic, a wrapper script around PyQt's +user interface compiler. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/tdepyuic +# The SIP files are outside TDE's prefix +%{_datadir}/sip/trinity/ + +########## + +%package doc +Summary: Documentation and examples for PyTDE +Group: Development/Libraries/Python + +Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +General documentation and examples for PyTDE providing programming +tips and working code you can use to learn from. + +%files doc +%defattr(-,root,root,-) +%{tde_tdedocdir}/HTML/en/pytde/ + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 +%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export LD_RUN_PATH="%{tde_libdir}" + +export DH_OPTIONS + +%__python configure.py \ + -k %{tde_prefix} \ + -L %{_lib} \ + -v %{_datadir}/sip/trinity + +%__make %{_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# Install documentation +%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ +%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/ + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 76f205659..bdf7bbe53 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -63,10 +63,10 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ BuildRequires: pytqt-devel >= %{?epoch:%{epoch}:}3.18.1 -BuildRequires: trinity-python-trinity-devel +BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools Requires: pytqt -Requires: trinity-python-trinity +Requires: trinity-pytde Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec deleted file mode 100644 index cde093dd8..000000000 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ /dev/null @@ -1,184 +0,0 @@ -# -# spec file for package python-trinity (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.1.0 -%endif -%define tde_pkg python-trinity -%define tde_prefix /opt/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_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 3.16.3 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Trinity bindings for Python -Group: Development/Libraries/Python -URL: http://www.trinitydesktop.org/ -#URL: http://www.simonzone.com/software/pykdeextensions - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ - -# PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 -%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 - -BuildRequires: python-tqt-devel -Requires: python-tqt - -# SIP -BuildRequires: sip4-tqt-devel >= 4.10.5 -Requires: sip4-tqt >= 4.10.5 - -Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: python-trinity = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -Python binding module that provides wide access to the Trinity API, -also known as PyTDE. Using this, you'll get (for example) classes -from tdeio, tdejs, tdehtml and tdeprint. - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{python_sitearch}/*.so -%{python_sitearch}/dcop*.py* -%{python_sitearch}/pytde*.py* - -########## - -%package devel -Summary: Trinity bindings for Python - Development files and scripts -Group: Development/Libraries/Python -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -Development .sip files with definitions of PyTDE classes. They -are needed to build PyTDE, but also as building blocks of other -packages based on them. -The package also contains kdepyuic, a wrapper script around PyQt's -user interface compiler. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/tdepyuic -# The SIP files are outside TDE's prefix -%{_datadir}/sip/trinity/ - -########## - -%package doc -Summary: Documentation and examples for PyTDE -Group: Development/Libraries/Python - -Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} - -%description doc -General documentation and examples for PyTDE providing programming -tips and working code you can use to learn from. - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/en/python-trinity/ - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 -%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|" -%endif - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export LD_RUN_PATH="%{tde_libdir}" - -export DH_OPTIONS - -%__python configure.py \ - -k %{tde_prefix} \ - -L %{_lib} \ - -v %{_datadir}/sip/trinity - -%__make %{_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Install documentation -%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ -%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/ - - -%clean -%__rm -rf %{buildroot} - - -%changelog -- cgit v1.2.1