rpms/kdebindings/F-11 kdebindings-4.2.85-old-PyQt4.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 kdebindings.spec, 1.201, 1.202 sources, 1.65, 1.66 kdebindings-4.2.3-gcc44.patch, 1.1, NONE

Wed Aug 5 02:45:54 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21334

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.2.85-old-PyQt4.patch 
Removed Files:
	kdebindings-4.2.3-gcc44.patch 
Log Message:
* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
- respin


kdebindings-4.2.85-old-PyQt4.patch:
 backendcapabilities.sip |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.2.85-old-PyQt4.patch ---
--- python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:30	959021
+++ python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:26	959020
@@ -26,7 +26,7 @@
 {
 namespace BackendCapabilities
 {
-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject,NoQMetaObject/
 {
 
 signals:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	30 May 2009 16:18:25 -0000	1.60
+++ .cvsignore	5 Aug 2009 02:45:53 -0000	1.61
@@ -1,6 +1,5 @@
-kdebindings-4.2.4.tar.bz2
-qtscript-sharp.pc
-qttest-sharp.pc
-qtuitools-sharp.pc
-qtwebkit-sharp.pc
-qyoto.pc
+kdebindings-4.2.90.tar.bz2
+kdebindings-4.2.95.tar.bz2
+kdebindings-4.2.96.tar.bz2
+kdebindings-4.2.98.tar.bz2
+kdebindings-4.3.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdebindings.spec	27 Jun 2009 14:46:58 -0000	1.201
+++ kdebindings.spec	5 Aug 2009 02:45:54 -0000	1.202
@@ -9,13 +9,16 @@
 %endif
 %endif
 %define falcon 1
+# FIXME: temporarily disable on rawhide, until build failures fixed
+%if 0%{?fedora} < 12
 %define php 1
+%endif
 %define ruby 1
 %define smoke 1
 %define java 0
 
 %define pykde4_akonadi 1
-%define pyqt4_version 4.5
+%define pyqt4_version 4.5.2
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
@@ -28,28 +31,26 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.2.4
+Version: 4.3.0
 Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: User Interface/Desktops
-License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qyoto/qyoto.pc
-Source2: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qttest/qttest-sharp.pc
-Source3: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtwebkit/qtwebkit-sharp.pc
-Source4: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtscript/qtscript-sharp.pc
-Source5: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtuitools/qtuitools-sharp.pc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
+# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
+Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # make the Python plugin factory work without python-devel
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
+
 ## upstream patches
-Patch100: kdebindings-4.2.3-gcc44.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -57,11 +58,14 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
+BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
 BuildRequires:  mono-core
@@ -248,10 +252,11 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q
 %patch0
+%patch1 -p0 -b .old-PyQt4
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
-%patch100 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}
@@ -298,11 +303,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?csharp}
-mkdir -p %{buildroot}%{_datadir}/pkgconfig/
-install -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
-  %{buildroot}%{_datadir}/pkgconfig/
-%endif
+# HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pykdeuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
+   %{buildroot}%{_bindir}/pykdeuic4
+ln -s %{_bindir}/pykdeuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
 
 %clean
@@ -313,6 +319,11 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%pre -n PyKDE4-devel
+if [ -d %{_bindir}/pykdeuic4 ]; then
+rm -rf %{_bindir}/pykdeuic4/
+fi
+
 
 %files
 %defattr(-,root,root,-)
@@ -335,8 +346,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{python_sitearch}/PyKDE4/
+%{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
 %dir %{_kde4_appsdir}/pykde4/
-%{_kde4_appsdir}/pykde4/*.py*
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -348,6 +359,8 @@ rm -rf %{buildroot}
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
+%{_kde4_bindir}/pykdeuic4
+%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
@@ -362,6 +375,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libnepomuk-sharp.so
 %{_kde4_libdir}/libplasma-sharp.so
 %{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/libqimageblitz-sharp.so
+%{_kde4_libdir}/mono/2.0/qimageblitz.dll
 %{_kde4_libdir}/mono/2.0/akonadi.dll
 %{_kde4_libdir}/mono/2.0/kde-dotnet.dll
 %{_kde4_libdir}/mono/2.0/khtml-dll.dll
@@ -376,6 +391,7 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/mono/gac/nepomuk-dll/
 %{_kde4_libdir}/mono/gac/plasma-dll/
 %{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_libdir}/mono/gac/qimageblitz/
 %{_kde4_appsdir}/plasma_scriptengine_kimono/
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
@@ -406,8 +422,7 @@ rm -rf %{buildroot}
 %{_bindir}/uics
 %{_includedir}/qyoto/
 %{_kde4_libdir}/libqyotoshared.so
-%{_datadir}/pkgconfig/qyoto.pc
-%{_datadir}/pkgconfig/qt*-sharp.pc
+%{_kde4_libdir}/pkgconfig/*
 %endif
 
 %if 0%{?ruby}
@@ -490,21 +505,59 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jun 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-3
-- rebuild (PyQt4-4.5)
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
+- respin
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)
 
-* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+- more pykdeuic4 and related multilib love (kdebug#198162)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-5
+- add correct check for php version
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-4
+- allow for build php-5.2.x
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-3
+- fix build issue with php-5.3.x
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- fix pykdeuic4-related install bits (kdebug#198162)
+- pyqt4_version 4.5.2
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-3
 - make the Python plugin factory work without python-devel
 
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-2
+- rework old-PyQt4 patch 
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- include more(all) csharp/qyoto .pc files snarfed from trunk/,
-  to match how everyone (except upstream) is shipping (#490555)
+* Thu May 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- respin against PyQt-4.5
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 20 2009 Than Ngo <than at redhat.com> - 4.2.85-1
+- 4.2.85 (4.3 beta1)
+- build fixes backported from trunk by Nicolas Lécureuil <neoclust at mandriva.org>
+- revert change which requires PyQt4 4.5 (Kevin Kofler)
+- fix build issue with gcc-4.4
 
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
 - F11+: enable csharp on ppc64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	30 May 2009 16:18:25 -0000	1.65
+++ sources	5 Aug 2009 02:45:54 -0000	1.66
@@ -1,6 +1 @@
-db0e95addf2b2874434ae8505733cdcd  kdebindings-4.2.4.tar.bz2
-a14a96333fd23f83cff9667b27b1b48d  qtscript-sharp.pc
-42067564487eb74cc6dc18f17f3d3bf8  qttest-sharp.pc
-2c30555ef7fa31418c38e907eb564f05  qtuitools-sharp.pc
-549f3a8cbda880c5f7bc2715cdea0f30  qtwebkit-sharp.pc
-f8e69ce5f5098bd8ffb8dc92acfa4452  qyoto.pc
+6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2


--- kdebindings-4.2.3-gcc44.patch DELETED ---


