rpms/PyKDE/devel PyKDE-3.16.0-konsolepart.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 PyKDE.spec, 1.3, 1.4 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1848

Modified Files:
	.cvsignore PyKDE.spec sources 
Added Files:
	PyKDE-3.16.0-konsolepart.patch 
Log Message:
* Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-1
- 3.16.0
- no longer own %_datadir/sip, sip-devel does now (#206633)


PyKDE-3.16.0-konsolepart.patch:

--- NEW FILE PyKDE-3.16.0-konsolepart.patch ---
--- PyKDE-3.16.0/configure.py.DESTDIR	2006-09-22 03:05:49.000000000 -0500
+++ PyKDE-3.16.0/configure.py	2006-09-26 14:18:18.000000000 -0500
@@ -768,8 +768,8 @@
         f.close ()
         target  = os.path.join (opt_kdelibdir, "kde3", "libkonsolepart.so")
         symlink = os.path.join (opt_kdelibdir, "libkonsolepart.so")
-        buff = buff.replace ("install:\n", "install:\n\tln -sf %s %s\n" % (target, symlink))
-        buff = buff.replace ("\nclean", "\tldconfig\n\nclean")
+        buff = buff.replace ("install:\n", "install:\n\tln -sf %s $(DESTDIR)%s\n" % (target, symlink))
+        buff = buff.replace ("\nclean", "\tldconfig ||:\n\nclean")
         f = open ("Makefile.new", "w")
         f.write (buff)
         f.close ()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2006 12:43:25 -0000	1.2
+++ .cvsignore	26 Sep 2006 20:19:02 -0000	1.3
@@ -1 +1,2 @@
 PyKDE-snapshot20060422.tar.gz
+PyKDE-3.16.0.tar.gz


Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PyKDE.spec	7 Sep 2006 19:57:59 -0000	1.3
+++ PyKDE.spec	26 Sep 2006 20:19:02 -0000	1.4
@@ -1,21 +1,23 @@
 
-%define snapshot 20060422
-
 Summary: Python bindings for KDE
 Name: 	 PyKDE
-Version: 3.15.2
-Release: 0.6.%{snapshot}%{?dist}
+Version: 3.16.0
+Release: 1%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
-Source:	 http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-snapshot%{snapshot}.tar.gz
+Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.gz
 Group: 	 Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: PyKDE-3.16.0-konsolepart.patch
+
 BuildRequires: python-devel >= 2.3
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+%if "%{?python_ver}" > "2"
 Requires: python-abi = %{python_ver}
+%endif
 
 BuildRequires: sip-devel >= 4.4.3 
 BuildRequires: PyQt-devel >= 3.16 
@@ -24,10 +26,13 @@
 Requires: PyQt = %{pyqt_ver}
 %endif
 
-BuildRequires: kdelibs-devel >= 6:3.4
+
+BuildRequires: kdelibs-devel kdebase
 %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1)
 %if "%{?kdelibs_ver}" > "2"
 Requires: kdelibs >= 6:%{kdelibs_ver}
+# for libkonsolepart.*
+Requires: kdebase
 %endif
 
 %description
@@ -46,6 +51,8 @@
 %prep
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
+%patch1 -p1 -b .konsolepart
+
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
@@ -53,12 +60,13 @@
 %{__python} configure.py -L %{_lib} -d %{python_sitedir}
 
 # smp broken
-make 
+make -k %{?_smp_mflags} || make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
@@ -70,17 +78,22 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS
 %{_bindir}/*
+%{_libdir}/libkonsolepart.*
 %{python_sitedir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* examples
-# imo, %_datadir/sip should be owned by sip-devel -- Rex
-%dir %{_datadir}/sip
+# %_datadir/sip should be owned by sip-devel (#206633) 
+#dir %{_datadir}/sip
 %{_datadir}/sip/*
 
 
 %changelog
+* Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-1
+- 3.16.0
+- no longer own %%_datadir/sip, sip-devel does now (#206633)
+
 * Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.15.2-0.6.20060422
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2006 12:43:25 -0000	1.2
+++ sources	26 Sep 2006 20:19:02 -0000	1.3
@@ -1 +1 @@
-3e6a41f3fc5f759713ba7fd3f70635b0  PyKDE-snapshot20060422.tar.gz
+92fa0f7d6063dc2aad97d5302975ca76  PyKDE-3.16.0.tar.gz