rpms/kdebindings/F-10 .cvsignore, 1.59, 1.60 kdebindings.spec, 1.168, 1.169 sources, 1.67, 1.68

Lukas Tinkl ltinkl at fedoraproject.org
Mon Nov 9 13:27:55 UTC 2009


Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30026/F-10

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	6 Oct 2009 13:46:38 -0000	1.59
+++ .cvsignore	9 Nov 2009 13:27:54 -0000	1.60
@@ -1 +1 @@
-kdebindings-4.3.2.tar.bz2
+kdebindings-4.3.3.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- kdebindings.spec	25 Oct 2009 05:04:58 -0000	1.168
+++ kdebindings.spec	9 Nov 2009 13:27:54 -0000	1.169
@@ -1,10 +1,18 @@
+
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
-%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+%if 0%{?fedora} > 11
+%ifnarch sparc64
 %define csharp 1
 %endif
-%if 0%{?fedora} > 10
-%ifarch ppc64
+%endif
+%if 0%{?fedora} == 11
+%ifarch %{ix86} x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64 
+%define csharp 1
+%endif
+%endif
+%if 0%{?fedora} == 10
+%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x ppc
 %define csharp 1
 %endif
 %endif
@@ -22,7 +30,11 @@
 %endif
 
 %define pykde4_akonadi 1
+%if 0%{?fedora} > 11
+%define pyqt4_version 4.6.1
+%else
 %define pyqt4_version 4.5.2
+%endif
 
 %if 0%{?rhel}
 %define falcon 0
@@ -44,7 +56,7 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.2
+Version: 4.3.3
 Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -59,6 +71,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 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
+# fix build with Qt 4.6
+Patch2:  kdebindings-4.3.3-qt46.patch
 
 ## upstream patches
 
@@ -267,6 +281,7 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
+%patch2 -p1 -b .qt46
 
 # upstream patches
 
@@ -332,6 +347,10 @@ mv %{buildroot}%{python_sitearch}/PyQt4/
 ln -s %{_bindir}/pykdeuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
+# install pykde4 examples under correct dir
+mkdir -p %{buildroot}%{_docdir}
+rm -f %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
+mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
 
 %clean
 rm -rf %{buildroot}
@@ -369,7 +388,7 @@ fi
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
-%dir %{_kde4_appsdir}/pykde4/
+%dir %{_docdir}/pykde4
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -383,7 +402,7 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_bindir}/pykdeuic4
 %{python_sitearch}/PyQt4/uic/pykdeuic4.py*
-%{_kde4_appsdir}/pykde4/examples/
+%{_docdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
 %if 0%{?csharp}
@@ -527,11 +546,21 @@ fi
 
 
 %changelog
+* Fri Nov 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
+- fix build with Qt 4.6
+
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- sync archs supporting csharp(mono)
+
 * Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
-- Fix bz#530667
+- fix bz#530667
 
-* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
+- fix bz#527464
 
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
 - rhel cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	6 Oct 2009 13:46:39 -0000	1.67
+++ sources	9 Nov 2009 13:27:54 -0000	1.68
@@ -1 +1 @@
-3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2
+4bc76f60e2c175d4e413a374c87f0e19  kdebindings-4.3.3.tar.bz2




More information about the fedora-extras-commits mailing list