rpms/kdeedu/devel kdeedu.spec,1.196,1.197
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 2 00:24:09 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27442
Modified Files:
kdeedu.spec
Log Message:
fix conflict with oxygen-icons
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdeedu.spec 1 Aug 2009 23:52:25 -0000 1.196
+++ kdeedu.spec 2 Aug 2009 00:24:05 -0000 1.197
@@ -165,6 +165,8 @@ make install/fast DESTDIR=%{buildroot} -
# #unpackaged files
# omit stuff for which there isn't a clear public API
rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+# oxygen-icon-theme conflict
+rm -fv %{buildroot%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
# omit dustismo roman font
rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -462,6 +464,7 @@ rm -rf %{buildroot}
- move kalziumuiwidgets.so designer plugin to -libs
- tighten -libs deps using %%?_isa
- %%check: desktop-file-validate
+- fix conflict with oxygen-icons
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0
More information about the scm-commits
mailing list