summaryrefslogtreecommitdiffstats
path: root/redhat/libraries/python-trinity
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/libraries/python-trinity')
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch56
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch11
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec186
-rw-r--r--redhat/libraries/python-trinity/python-trinity.spec (renamed from redhat/libraries/python-trinity/python-trinity-14.0.0.spec)20
4 files changed, 16 insertions, 257 deletions
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
deleted file mode 100644
index fb41680f1..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI 2014-03-22 23:47:29.217935267 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip 2014-03-22 23:47:53.355370778 +0100
-@@ -153,10 +153,8 @@
- bool deleteGroup (const QString&, bool = 1, bool = 0);
- void setDollarExpansion (bool = 1);
- bool isDollarExpansion () const;
-- virtual void rollback (bool = 1);
- virtual void sync ();
- bool isDirty () const;
-- virtual void setReadOnly (bool);
- bool isReadOnly () const;
- bool hasKey (const QString&) const;
- virtual QMap<QString,QString> entryMap (const QString&) const = 0;
-@@ -182,6 +180,9 @@
- bool hasDefault (const QString&) const;
- %End
-
-+private:
-+ virtual void rollback (bool = 1);
-+ virtual void setReadOnly (bool);
-
- protected:
- void setLocale ();
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI 2014-03-22 23:56:28.448338190 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip 2014-03-22 23:58:44.540121011 +0100
-@@ -53,6 +53,8 @@
- virtual void keyPressEvent (QKeyEvent*);
- %End
-
-+private:
-+ virtual void setSource(const QString&);
-
- }; // class KActiveLabel
-
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI 2014-03-23 00:02:17.343077605 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip 2014-03-23 00:03:42.151069824 +0100
-@@ -54,6 +54,8 @@
- protected:
- virtual KPopupMenu* createPopupMenu ();
-
-+private:
-+ virtual bool eventFilter(QObject*, QEvent*);
- }; // class KPixmapRegionSelectorWidget
-
- %End
---- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI 2014-03-23 00:13:21.583382771 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip 2014-03-23 00:17:02.715146838 +0100
-@@ -77,6 +77,8 @@
- virtual void addApplicationEvents (const QString&);
- virtual void clearApplicationEvents ();
-
-+private slots:
-+ virtual void slotDefault();
- }; // class KNotifyDialog
-
- %End
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
deleted file mode 100644
index 5921695e8..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-python-trinity-3.5.13.2/configure.py.ORI 2013-01-20 14:28:38.844683333 +0100
-+++ trinity-python-trinity-3.5.13.2/configure.py 2013-01-20 14:29:05.179062079 +0100
-@@ -410,7 +410,7 @@
-
- if not opt_kdeincdir:
- incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
-- incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
-+ incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # Red Hat
- opt_kdeincdir = search ("kapplication.h", incSearchPaths)
-
- def check_kde_installation():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
deleted file mode 100644
index 279346a1f..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ /dev/null
@@ -1,186 +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}
-
-%define __arch_install_post %{nil}
-
-
-Name: trinity-python-trinity
-Summary: Trinity bindings for Python [Trinity]
-Version: 3.16.3
-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
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# Fix include subdirectory 'tde' instead of 'kde'
-Patch1: python-trinity-3.5.13.2-fix_tde_includedir.patch
-# Fix "is private" FTBFS using SIP >= 4.15
-Patch2: python-trinity-3.5.13.2-fix_is_private.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 support
-BuildRequires: python
-BuildRequires: python-qt3-devel
-
-# SIP support
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# RHEL 4/5 comes with old version, so we brought ours ...
-BuildRequires: trinity-sip-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-sip
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires: sip-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: python-sip-devel
-%endif
-
-Obsoletes: python-trinity < %{version}-%{release}
-Provides: python-trinity = %{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 kio, kjs, khtml and kprint.
-
-
-%package devel
-Summary: Trinity bindings for Python - Development files and scripts [Trinity]
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-Obsoletes: python-trinity-devel < %{version}-%{release}
-Provides: python-trinity-devel = %{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 python-qt3's
-user interface compiler.
-
-
-%package doc
-Summary: Documentation and examples for PyTDE [Trinity]
-Group: Development/Libraries
-
-Obsoletes: python-trinity-doc < %{version}-%{release}
-Provides: python-trinity-doc = %{version}-%{release}
-
-%description doc
-General documentation and examples for PyTDE providing programming
-tips and working code you can use to learn from.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .private
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LD_RUN_PATH="%{tde_libdir}"
-export KDEDIR=%{tde_prefix}
-
-export DH_OPTIONS
-
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-%__python configure.py \
- -k %{tde_prefix} \
- -L %{_lib} \
- -v %{_datadir}/sip/trinity
-
-# Shitty hack to add LDFLAGS
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i */Makefile \
- -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%endif
-
-# Shitty hack to fix issue with SIP >= 4.15
-%__sed -i "kfile/sipkfilepart0.cpp" \
- -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \
- -e "s| KFileIconView::clear()| KFileView::clear()|g" \
- -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \
- -e "s| KFileDetailView::clear()| KFileView::clear()|g"
-
-
-%__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}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pykde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%changelog
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity.spec
index f969038f9..c70454f2b 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity.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 python-trinity
%define tde_prefix /opt/trinity
@@ -65,7 +63,17 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
-BuildRequires: python
+%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
+
BuildRequires: python-tqt-devel
Requires: python-tqt
@@ -139,6 +147,10 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
%build
unset QTDIR QTINC QTLIB
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 16:27:56 +0000