François Andriot
10 years ago
parent
7def4cde27
commit
2822eef235
@ -1,33 +0,0 @@
|
||||
--- python-trinity/sip/kdecore/kaccel.sip.ORI 2012-05-01 23:10:27.686395190 +0200
|
||||
+++ python-trinity/sip/kdecore/kaccel.sip 2012-05-01 23:10:39.955113222 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
KAccel (QWidget* /TransferThis/, const char* = 0);
|
||||
KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
|
||||
KAccelActions& actions ();
|
||||
- bool isEnabled () const;
|
||||
+ bool isEnabled ();
|
||||
void setEnabled (bool);
|
||||
bool setAutoUpdate (bool);
|
||||
|
||||
--- python-trinity/sip/kdecore/kaccelbase.sip.ORI 2012-05-01 23:13:58.455551130 +0200
|
||||
+++ python-trinity/sip/kdecore/kaccelbase.sip 2012-05-01 23:14:14.835174681 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
KAccelBase (int);
|
||||
uint actionCount () const;
|
||||
KAccelActions& actions ();
|
||||
- bool isEnabled () const;
|
||||
+ bool isEnabled ();
|
||||
KAccelAction* actionPtr (const QString&);
|
||||
KAccelAction* actionPtr (const KKey&);
|
||||
KAccelAction* actionPtr (const KKeyServer::Key&);
|
||||
--- python-trinity/sip/kdecore/kglobalaccel.sip.ORI 2012-05-01 23:19:11.934346517 +0200
|
||||
+++ python-trinity/sip/kdecore/kglobalaccel.sip 2012-05-01 23:19:18.755189755 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
public:
|
||||
KGlobalAccel (QObject*, const char* = 0);
|
||||
- bool isEnabled () const;
|
||||
+ bool isEnabled ();
|
||||
void setEnabled (bool);
|
||||
KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- python-trinity/configure.py.ORI 2012-08-05 00:02:51.785715468 +0200
|
||||
+++ python-trinity/configure.py 2012-08-05 00:03:02.312464939 +0200
|
||||
@@ -513,7 +513,7 @@
|
||||
|
||||
for file in dist:
|
||||
if file.find ("andrake") > 0:
|
||||
- kde_sip_flags.remove ("ALL")
|
||||
+ kde_sip_flags.pop()
|
||||
kde_sip_flags.append ("D_MANDRAKE")
|
||||
|
||||
def set_sip_flags():
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/configure.py.ORI 2011-12-03 17:07:41.589390850 +0100
|
||||
+++ b/configure.py 2011-12-03 17:14:35.226888035 +0100
|
||||
@@ -786,7 +786,7 @@
|
||||
sipconfig.ParentMakefile(
|
||||
configuration = pyqtcfg,
|
||||
subdirs = subdirs,
|
||||
- installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
|
||||
+ installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), opt_kdebasedir + "/bin")]
|
||||
).generate()
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- python-trinity-3.5.13.1/configure.py.ORI 2012-10-02 19:01:51.164215802 +0000
|
||||
+++ python-trinity-3.5.13.1/configure.py 2012-10-02 19:02:06.842913909 +0000
|
||||
@@ -411,6 +411,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")) # TDE 3.5.13.1
|
||||
opt_kdeincdir = search ("kapplication.h", incSearchPaths)
|
||||
|
||||
def check_kde_installation():
|
||||
@ -1,187 +0,0 @@
|
||||
%{!?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}
|
||||
|
||||
%define __arch_install_post %{nil}
|
||||
|
||||
|
||||
Name: python-trinity
|
||||
Summary: Trinity bindings for Python [Trinity]
|
||||
Version: 3.16.3
|
||||
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: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: python-trinity-3.5.13.1.tar.gz
|
||||
|
||||
## RHEL/Fedora patches
|
||||
Patch1: python-trinity-3.5.13-install_directories.patch
|
||||
# [python-trinity] Fix Mandrake detection function
|
||||
Patch3: python-trinity-3.5.13-fix_mandrake_detection.patch
|
||||
# [python-trinity] Add 'include/tde' include directory
|
||||
Patch4: python-trinity-3.5.13.1-add_include_directory.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
|
||||
|
||||
%if 0%{?rhel} == 5
|
||||
# RHEL 5 comes with old version, so we brought ours ...
|
||||
BuildRequires: trinity-sip-devel
|
||||
BuildRequires: trinity-PyQt-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
BuildRequires: python-sip
|
||||
BuildRequires: python-qt
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora}
|
||||
BuildRequires: sip-devel
|
||||
BuildRequires: PyQt-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: python-sip-devel
|
||||
BuildRequires: trinity-PyQt-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
Python binding module that provides wide access to the Trinity API,
|
||||
also known as PyKDE. 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}
|
||||
|
||||
%description devel
|
||||
Development .sip files with definitions of PyKDE classes. They
|
||||
are needed to build PyKDE, 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.
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation and examples for PyKDE [Trinity]
|
||||
Group: Development/Libraries
|
||||
|
||||
%description doc
|
||||
General documentation and examples for PyKDE 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 python-trinity-3.5.13.1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
|
||||
# Hack to get TQT include files under /opt
|
||||
%__sed -i "configure.py" \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
export LDFLAGS="${LDFLAGS} -lpython2.7"
|
||||
|
||||
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
|
||||
|
||||
%__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 \
|
||||
%if 0%{?pclinuxos}
|
||||
-e "/^LIBS = / s|$| -lpython2.6 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
|
||||
%else
|
||||
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%__make %{_smp_mflags}
|
||||
|
||||
%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
|
||||
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3
|
||||
- Initial release for TDE 3.5.13.1
|
||||
@ -1,177 +0,0 @@
|
||||
%{!?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}/kde
|
||||
%define tde_tdeincludedir %{tde_includedir}/kde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
%define __arch_install_post %{nil}
|
||||
|
||||
|
||||
Name: python-trinity
|
||||
Summary: Trinity bindings for Python [Trinity]
|
||||
Version: 3.16.3
|
||||
Release: 2%{?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: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: python-trinity-3.5.13.tar.gz
|
||||
|
||||
## RHEL/Fedora patches
|
||||
Patch1: python-trinity-3.5.13-install_directories.patch
|
||||
# [python-trinity] Fix compilation with GCC 4.7
|
||||
Patch2: python-trinity-3.5.13-fix_gcc47_compilation.patch
|
||||
# [python-trinity] Fix Mandrake detection function
|
||||
Patch3: python-trinity-3.5.13-fix_mandrake_detection.patch
|
||||
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
|
||||
BuildRequires: python
|
||||
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
BuildRequires: python-sip
|
||||
BuildRequires: python-qt
|
||||
%else
|
||||
%if 0%{?rhel} == 5
|
||||
# RHEL 5 comes with old version, so we brought ours ...
|
||||
BuildRequires: trinity-sip-devel
|
||||
BuildRequires: trinity-PyQt-devel
|
||||
%else
|
||||
BuildRequires: sip-devel
|
||||
BuildRequires: PyQt-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Python binding module that provides wide access to the Trinity API,
|
||||
also known as PyKDE. 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}
|
||||
|
||||
%description devel
|
||||
Development .sip files with definitions of PyKDE classes. They
|
||||
are needed to build PyKDE, 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.
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation and examples for PyKDE [Trinity]
|
||||
Group: Development/Libraries
|
||||
|
||||
%description doc
|
||||
General documentation and examples for PyKDE providing programming
|
||||
tips and working code you can use to learn from.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n libraries/python-trinity
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
|
||||
# Hack to get TQT include files under /opt
|
||||
%__sed -i "configure.py" \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
export LDFLAGS="${LDFLAGS} -lpython2.7"
|
||||
|
||||
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
|
||||
|
||||
%__python configure.py \
|
||||
-k %{tde_prefix} \
|
||||
-L %{_lib} \
|
||||
-v %{_datadir}/sip/trinity
|
||||
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
# Shitty hack to add LDFLAGS
|
||||
%__sed -i */Makefile \
|
||||
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
|
||||
%endif
|
||||
|
||||
%__make %{_smp_mflags}
|
||||
|
||||
%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
|
||||
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
|
||||
- Rebuild for Fedora 17
|
||||
- Fix compilation with GCC 4.7
|
||||
- Fix compilation for RHEL 5
|
||||
|
||||
* Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
Loading…
Reference in new issue