SPECS: kdenetwork.spec - don't remove files that are packaged - dr...

[glen]

Author: glen                         Date: Wed Apr  5 22:24:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't remove files that are packaged
- drop ccache hacks (fixed automake)

---- Files affected:
SPECS:
   kdenetwork.spec (1.218 -> 1.219) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.218 SPECS/kdenetwork.spec:1.219
--- SPECS/kdenetwork.spec:1.218	Wed Apr  5 23:01:03 2006
+++ SPECS/kdenetwork.spec	Thu Apr  6 00:24:00 2006
@@ -1055,15 +1055,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
-	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
-	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)' \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 %{__make} -C kopete/protocols/winpopup install \
-	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
-	CCLD=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
-	AM_MAKEFLAGS='CXXLD=$(CXXLD) CCLD=$(CCLD)' \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
@@ -1085,7 +1079,6 @@
 install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/winpopup-install.sh
 
 # Messing ones
-rm $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
 rm $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
 rm $RPM_BUILD_ROOT%{_iconsdir}/locolor/32x32/apps/krfb.png
 
@@ -1756,6 +1749,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.219  2006/04/05 22:24:00  glen
+- don't remove files that are packaged
+- drop ccache hacks (fixed automake)
+
 Revision 1.218  2006/04/05 21:01:03  glen
 - fix xmms configure option
 - drop ccache related hacks (fixed automake)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.218&r2=1.219&f=u