rpms/PyQt4/F-8 PyQt-x11-gpl-4.1.1-qconfig_h.patch, NONE, 1.1 PyQt-x11-gpl-4.2-64bit.patch, NONE, 1.1 PyQt4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 4 21:01:33 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15815

Modified Files:
	.cvsignore sources 
Added Files:
	PyQt-x11-gpl-4.1.1-qconfig_h.patch 
	PyQt-x11-gpl-4.2-64bit.patch PyQt4.spec 
Log Message:
import, sync w/devel branch


PyQt-x11-gpl-4.1.1-qconfig_h.patch:

--- NEW FILE PyQt-x11-gpl-4.1.1-qconfig_h.patch ---
--- PyQt-x11-gpl-4.1.1/configure.py.qconfig_h	2006-12-09 13:27:48.000000000 -0600
+++ PyQt-x11-gpl-4.1.1/configure.py	2007-02-28 07:20:02.000000000 -0600
@@ -795,10 +795,10 @@
     global qt_edition
 
     # See if it is the open source edition.
-    qconfig = qt_core_header(incdir, "qconfig.h")
+    qconfig = qt_core_header(incdir, "@@QCONFIG_H@@")
 
     if not qconfig:
-        sipconfig.error("qconfig.h could not be found in %s." % incdir)
+        sipconfig.error("@@QCONFIG_H@@ could not be found in %s." % incdir)
 
     f = open(qconfig)
     l = f.readline()

PyQt-x11-gpl-4.2-64bit.patch:

--- NEW FILE PyQt-x11-gpl-4.2-64bit.patch ---
diff -up PyQt-x11-gpl-4.2/configure.py.get_python_lib PyQt-x11-gpl-4.2/configure.py
--- PyQt-x11-gpl-4.2/configure.py.get_python_lib	2007-10-03 13:01:40.000000000 -0400
+++ PyQt-x11-gpl-4.2/configure.py	2007-10-03 13:16:00.000000000 -0400
@@ -390,15 +390,16 @@ include(%s)
             else:
                 # Use distutils to get the additional configuration.
                 from distutils.sysconfig import get_config_vars
+                from distutils.sysconfig import get_python_lib
+
                 ducfg = get_config_vars()
 
                 if sys.platform == "darwin":
                     # We need to work out how to specify the right framework
                     # version.
                     link = "-framework Python"
-                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
-                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
-                    link = "-L%s/lib -lpython%d.%d" % (ducfg["prefix"], py_major, py_minor)
+                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): 
+                    link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
                 else:
                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                     enabled = False


--- NEW FILE PyQt4.spec ---

# Fedora review: http://bugzilla.redhat.com/190189

Summary: Python bindings for Qt4
Name: 	 PyQt4
Version: 4.2
Release: 8%{?dist}

License: GPLv2
Group: 	 Development/Languages
Url: 	 http://www.riverbankcomputing.co.uk/pyqt/
Source0: http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:  PyQt-x11-gpl-4.1.1-qconfig_h.patch
Patch2:  PyQt-x11-gpl-4.2-64bit.patch

BuildRequires: qt4-devel
BuildRequires: chrpath
BuildRequires: findutils

BuildRequires: python-devel
%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
#global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")

BuildRequires: sip-devel >= 4.6
%global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1)
%if "%{?sip_ver}" > "3"
# To be paranoid, could change >= to = -- Rex
Requires: sip >= %{sip_ver}
%endif

%description
These are Python bindings for Qt4.

%package devel
Summary: Files needed to build other bindings based on Qt4
Group:	 Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel
Requires: sip-devel
%description devel
Files needed to build other bindings for C++ classes that inherit from any
of the Qt4 classes (e.g. KDE or your own).


%prep
%setup -q -n PyQt-x11-gpl-%{version}

## hack to find proper multilib'd qconfig.h
if [ -f %{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h ]; then
%patch1 -p1 -b .qconfig_h
sed -i -e "s|@@QCONFIG_H@@|qconfig-%{_arch}.h|g" configure.py
fi

%patch2 -p1 -b .64bit

# mark examples non-executable
find examples/ -name "*.py" | xargs chmod a-x


%build

QT4DIR=%{_qt4_prefix}
PATH=%{_qt4_bindir}:$PATH ; export PATH
# configure.py isn't smart enough to either use qmake or QMAKEPATH
QMAKESPEC=$QT4DIR/mkspecs/linux-g++; export QMAKESPEC
%if "%{_lib}" == "lib64"
QMAKESPEC=$QT4DIR/mkspecs/linux-g++-64 ; export QMAKESPEC
%endif

echo yes | %{__python} configure.py -w -d %{python_sitearch}/PyQt4

make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}

# fix/remove rpath
chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so

# non-executable script
chmod 755 %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py

# missing shebang
cp -a %{buildroot}%{_bindir}/pyuic4 %{buildroot}%{_bindir}/pyuic4.ORIG
cat > %{buildroot}%{_bindir}/pyuic4 <<EOF
#!/bin/sh

EOF
cat %{buildroot}%{_bindir}/pyuic4.ORIG >> %{buildroot}%{_bindir}/pyuic4
rm -f %{buildroot}%{_bindir}/pyuic4.ORIG


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitearch}/PyQt4/

%files devel
%defattr(-,root,root,-)
%doc doc/*
%doc examples/
%{_bindir}/*
%{_datadir}/sip/PyQt4/
%{_qt4_plugindir}/designer/*


%changelog
* Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-8
- drop ExcludeArch: ppc64 , qt4 bug is (hopefully) fixed.

* Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-7
- fix QtDesigner plugin install

* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-6
- 64bit QtDesigner patch

* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-5
- -devel: Requires: qt4-devel

* Sun Aug 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-4
- use %%python_sitearch
- License: GPLv2

* Thu Aug 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-3
- fix python_sitelib typo (wrt chrpath call)
- move %%_bindir stuff to -devel
- mark %%doc examples non-executable
- add shebang to %%_bindir/pyuic4

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-2
- remove rpath from QtDesigner.so
- BR: qt4-devel > 4.3.0-8

* Wed Apr 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-1
- PyQt4-4.2

* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.1.1-2
- fix build against multilib'd qt4

* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 4.1.1-1
- PyQt4-4.1.1
- BR: sip-devel >= 4.5.1

* Mon Nov 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1-1
- PyQt4-4.1

* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0.1-4
- don't own %%_datadir/sip (bug #206633)

* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0.1-3
- BR: qt4-devel < 4.2

* Sat Jul 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0.1-2
- fix reference(s) to qmake(4)

* Sun Jul 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0.1-1
- PyQt-4.0.1

* Mon Jun 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-1
- PyQt-4.0(final)
- BR: sip-devel >= 4.4.4 (see bug #199430)

* Fri May 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-0.6.beta1
- drop BR: qt4-MySQL qt4-ODBC qt4-PostgreSQL
- drop usage of (undefined) %%sip_min

* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-0.5.beta1
- cleanup for Extras

* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-0.4.beta1
- 4.0beta1

* Thu Apr 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-0.3.20060421 
- respin for sip-4.4.3
- use sip-abi, sip-abi-min

* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.0-0.2.20060421
- 20060421 snapshot

* Wed Apr 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.0-0.1.20060417
- first try, using 20060417 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2007 19:38:39 -0000	1.1
+++ .cvsignore	4 Oct 2007 21:01:00 -0000	1.2
@@ -0,0 +1 @@
+PyQt-x11-gpl-4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2007 19:38:39 -0000	1.1
+++ sources	4 Oct 2007 21:01:00 -0000	1.2
@@ -0,0 +1 @@
+af4baa7f7441914f9a527ef3cf788fef  PyQt-x11-gpl-4.2.tar.gz




More information about the fedora-extras-commits mailing list