rpms/kde-l10n/devel kde-l10n.spec,1.40,1.41

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4318/devel

Modified Files:
	kde-l10n.spec 
Log Message:
* Sun Jul 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-1.2
- file conflict between kde-l10n and libkdcraw (#456797)



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde-l10n.spec	26 Jul 2008 23:46:52 -0000	1.40
+++ kde-l10n.spec	27 Jul 2008 21:58:32 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.0
-Release: 1%{dist}.1
+Release: 1%{dist}.2
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -751,8 +751,10 @@
   if [ -e docs/kdeadmin/CMakeLists.txt ] ; then
     sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt
   fi
-  # on F9, remove all kdepim stuff except kjots
 %if 0%{?fedora} <= 9
+# remove kdegraphics/libkdcraw
+  rm -f messages/kdegraphics/libkdcraw.po
+# remove all kdepim stuff except kjots
   for j in messages/kdepim/*.po ; do
     if [ "$j" != "messages/kdepim/kjots.po" ] ; then
       rm -f "$j"
@@ -1274,6 +1276,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sun Jul 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-1.2
+- file conflict between kde-l10n and libkdcraw (#456797)
+
 * Sat Jul 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-1.1
 - on F9, remove translations for kdepim apps we don't ship (#456745)