rpms/kdebase4/devel kdebase4.spec,1.7,1.8

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Mon Nov 19 23:12:29 UTC 2007


Author: kkofler

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

Modified Files:
	kdebase4.spec 
Log Message:
remove new directory/files %{_kde4_datadir}/templates (conflict with KDE 3)


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/kdebase4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdebase4.spec	19 Nov 2007 22:36:48 -0000	1.7
+++ kdebase4.spec	19 Nov 2007 23:11:54 -0000	1.8
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.96.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 %if 0%{?fedora} > 9
 Name:          kdebase
@@ -135,6 +135,7 @@
 rm -rf %{buildroot}%{_kde4_datadir}/config
 rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
 rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
+rm -rf %{buildroot}%{_kde4_datadir}/templates
 # binaries: conflict with kdebase
 rm -f %{buildroot}%{_kde4_bindir}/drkonqi
 rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
@@ -252,6 +253,9 @@
 
 
 %changelog
+* Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-3
+- remove new directory/files %{_kde4_datadir}/templates (conflict with KDE 3)
+
 * Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-2
 - (re)add %{_kde4_iconsdir}/oxygen/*/*/* to file list
 




More information about the fedora-extras-commits mailing list