SPECS: kdeutils.spec - add kde-common-PLD patch; fix build

[glen]

Author: glen                         Date: Thu Oct 12 20:48:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add kde-common-PLD patch; fix build

---- Files affected:
SPECS:
   kdeutils.spec (1.180 -> 1.181) 

---- Diffs:

================================================================
Index: SPECS/kdeutils.spec
diff -u SPECS/kdeutils.spec:1.180 SPECS/kdeutils.spec:1.181
--- SPECS/kdeutils.spec:1.180	Thu Oct  5 00:09:15 2006
+++ SPECS/kdeutils.spec	Thu Oct 12 22:48:07 2006
@@ -24,7 +24,8 @@
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	a20a732284a3dcb735665e45f5be532e
 #Patch100:	%{name}-branch.diff
-Patch0:		kde-ac260-lt.patch
+Patch0:		kde-common-PLD.patch
+Patch1:		kde-ac260-lt.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	ed
@@ -385,6 +386,7 @@
 Summary(pt_BR):	Miniaplicativo de status de bateria para laptops
 Group:		X11/Applications
 Requires:	kdebase-infocenter >= %{_minbaseevr}
+Requires:	tpctl
 Obsoletes:	laptop
 
 %description klaptopdaemon
@@ -557,8 +559,7 @@
 %setup -q
 #%patch100 -p1
 %patch0 -p1
-
-%{__sed} -i -e 's#/copy.py#/copy.pyc#g' admin/acinclude.m4.in
+%patch1 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
 	ark/ark.desktop
@@ -582,6 +583,7 @@
 
 %build
 cp /usr/share/automake/config.sub admin
+%{__make} -f admin/Makefile.common cvs
 
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
@@ -598,6 +600,7 @@
 %endif
 	--with-qt-libraries=%{_libdir} \
 	--with-snmp \
+	--with-pythondir=/usr \
 	%{?with_xmms:--with-xmms}
 
 %{__make}
@@ -608,7 +611,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-rm -rf *.lang
+rm -f *.lang
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -925,6 +928,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181  2006/10/12 20:48:07  glen
+- add kde-common-PLD patch; fix build
+
 Revision 1.180  2006/10/04 22:09:15  adgor
 - Cleanups
 
@@ -1000,7 +1006,7 @@
 - rel 1
 
 Revision 1.156  2005/11/16 14:55:39  arekm
-- missing BR for kcalc; fix duplication of kmilo in %%files
+- missing BR for kcalc; fix duplication of kmilo in %files
 
 Revision 1.155  2005/11/16 11:34:15  adgor
 - 3.5.0rc1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdeutils.spec?r1=1.180&r2=1.181&f=u