packages: kdebase/kdebase.spec - gcc4.4 fix - you should not run make in %prep

[glen]

Author: glen                         Date: Wed May 20 10:07:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gcc4.4 fix
- you should not run make in %prep

---- Files affected:
packages/kdebase:
   kdebase.spec (1.624 -> 1.625) 

---- Diffs:

================================================================
Index: packages/kdebase/kdebase.spec
diff -u packages/kdebase/kdebase.spec:1.624 packages/kdebase/kdebase.spec:1.625
--- packages/kdebase/kdebase.spec:1.624	Wed May 20 09:14:44 2009
+++ packages/kdebase/kdebase.spec	Wed May 20 12:07:32 2009
@@ -76,6 +76,7 @@
 Patch27:	%{name}-consolekit.patch
 Patch28:	%{name}-no_mkfontdir.patch
 Patch29:	kde-am.patch
+Patch30:	%{name}-gcc44.patch
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	OpenGL-devel
 BuildRequires:	audiofile-devel
@@ -1101,6 +1102,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -1150,9 +1152,7 @@
 	fi
 done
 
-cp /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
+mv -f configure{,.dist}
 %build
 %if %{with apidocs}
 	if [ ! -f "%{_kdedocdir}/en/common/kde-common.css" ]; then
@@ -1162,6 +1162,11 @@
 	fi
 %endif
 
+cp /usr/share/automake/config.sub admin
+if [ ! -f configure ]; then
+	%{__make} -f admin/Makefile.common cvs
+fi
+
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
@@ -2646,6 +2651,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.625  2009/05/20 10:07:32  glen
+- gcc4.4 fix
+- you should not run make in %prep
+
 Revision 1.624  2009/05/20 07:14:44  glen
 - automake 1.11 from kdelibs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdebase/kdebase.spec?r1=1.624&r2=1.625&f=u