rpms/koffice/devel koffice.spec,1.82,1.83

[Rex Dieter]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
* Wed Dec 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.98.2-3
- Conflicts with oxygen-icon-theme-4.1.80 (#474268)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- koffice.spec	1 Dec 2008 15:00:34 -0000	1.82
+++ koffice.spec	3 Dec 2008 16:21:39 -0000	1.83
@@ -7,7 +7,7 @@
 Name:           koffice
 Epoch:          1
 Version:        1.9.98.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -283,6 +283,8 @@
 # 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
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.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
@@ -713,6 +715,9 @@
 
 
 %changelog
+* Wed Dec 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.98.2-3
+- Conflicts with oxygen-icon-theme-4.1.80 (#474268)
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.9.98.2-2
 - Rebuild for Python 2.6