SPECS: kdebindings.spec - merge from AC-branch

[glen]

Author: glen                         Date: Sun Oct 15 12:59:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch

---- Files affected:
SPECS:
   kdebindings.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/kdebindings.spec
diff -u SPECS/kdebindings.spec:1.75 SPECS/kdebindings.spec:1.76
--- SPECS/kdebindings.spec:1.75	Wed Oct 11 09:11:10 2006
+++ SPECS/kdebindings.spec	Sun Oct 15 14:59:21 2006
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TODO
+# - python-dcop binding .so files are installed into /usr/share after pld-common-PLD patch!
+# - do we need pcop.la from pyhton-dcop? (create -devel?) anyone knows add rm -f into install section
 #
 # Conditional build:
 %bcond_without	ruby	# disable ruby
@@ -17,15 +20,16 @@
 Summary(pl):	Dowiązania KDE dla języków innych niż C++
 Summary(pt_BR):	Bindings para KDE
 Name:		kdebindings
-Version:	3.5.4
-Release:	1
+Version:	3.5.5
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	097eb4311f5715f36fdc83dc5badb476
-Patch0:		%{name}-ac.patch
-#Patch100:	%{name}-branch.diff
-Patch1:		kde-ac260-lt.patch
+# Source0-md5:	e0da219943407a786c2ceea1605fadd1
+#Patch100: %{name}-branch.diff
+Patch0:		kde-common-PLD.patch
+Patch1:		%{name}-ac.patch
+Patch2:		kde-ac260-lt.patch
 URL:		http://www.kde.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -41,7 +45,7 @@
 BuildRequires:	perl-devel
 BuildRequires:	perl-modules >= 1:5.8.0
 #BuildRequires:	pnet >= 0.4.8
-BuildRequires:	python-devel >= 2.1
+BuildRequires:	python-devel >= 1:2.1
 %if %{with ruby}
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby-devel
@@ -408,17 +412,16 @@
 %prep
 %setup -q
 #%patch100 -p1
-%patch0 -p1 -b .niedakh
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-%build
 # dont build pyQt and pyKDE since we build it from a separate spec
-echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE python\"" > python/configure.in.in
+echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE python"' > python/configure.in.in
 
+%build
 cp %{_datadir}/automake/config.sub admin
-#export UNSERMAKE=/usr/share/unsermake/unsermake
 %{__make} -f admin/Makefile.common cvs
-
 %configure \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
@@ -522,15 +525,17 @@
 %{_libdir}/*kjsembed.la
 %{_includedir}/kjsembed
 
-# python bindings for dcop, others wont be built
-
+# python bindings for dcop, others won't be built
 %files python-dcop
 %defattr(644,root,root,755)
-%{py_libdir}/pydcop.py
-%attr(755,root,root) %{py_libdir}/site-packages/pcop.so
+#%{py_libdir}/pydcop.py
+#%attr(755,root,root) %{py_libdir}/site-packages/pcop.so
+%{py_scriptdir}/pydcop.py
+# FIXME: should be in /usr/lib!
+%{py_sitescriptdir}/pcop.la
+%attr(755,root,root) %{py_sitescriptdir}/pcop.so
 
 # C bindings for qt and kde using the smoke technology
-
 %files smoke-qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*smokeqt.so.1.2.2
@@ -683,6 +688,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2006/10/15 12:59:21  glen
+- merge from AC-branch
+
 Revision 1.75  2006/10/11 07:11:10  arekm
 - add kde-ac260-lt.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebindings.spec?r1=1.75&r2=1.76&f=u