rpms/koffice/devel koffice.spec,1.79,1.80

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24933

Modified Files:
	koffice.spec 
Log Message:
* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-2
- fix conflicts with oxygen-icon-theme



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- koffice.spec	12 Nov 2008 20:35:06 -0000	1.79
+++ koffice.spec	14 Nov 2008 17:29:26 -0000	1.80
@@ -7,7 +7,7 @@
 Name:           koffice
 Epoch:          1
 Version:        1.9.98.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -271,15 +271,19 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
+# conflicts with oxygen-icon-theme  
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
+# extraneous stuff we don't want in -devel
 rm -f %{buildroot}%{_kde4_libdir}/lib*common.so
 rm -f %{buildroot}%{_kde4_libdir}/lib*filters.so
 rm -f %{buildroot}%{_kde4_libdir}/lib*private.so
@@ -709,6 +713,9 @@
 
 
 %changelog
+* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-2
+- fix conflicts with oxygen-icon-theme
+
 * Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
 - koffice-1.9.98.2 (koffice2 beta2)
 - kchart awol