rpms/kdepim/devel kdepim.spec,1.178,1.179

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sun Jul 13 17:19:30 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29679

Modified Files:
	kdepim.spec 
Log Message:
* Sun Jul 13 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-3
- fix conflict with oxygen-icon-theme



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kdepim.spec	13 Jul 2008 16:19:32 -0000	1.178
+++ kdepim.spec	13 Jul 2008 17:18:37 -0000	1.179
@@ -7,7 +7,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.0.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -106,7 +106,7 @@
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # conflict with oxygen-icon-theme
-rm -rf %{buildroot}%{_kde4_icondir}/oxygen/32x32/actions/appointment-new.png
+rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
 
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
@@ -154,8 +154,8 @@
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/icons/hicolor/*/*/*
-%{_kde4_datadir}/icons/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
@@ -176,7 +176,7 @@
 
 
 %changelog
-* Sun Jul 13 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
+* Sun Jul 13 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-3
 - fix conflict with oxygen-icon-theme
 
 * Thu Jul 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1




More information about the scm-commits mailing list