rpms/kde-l10n/F-12 kde-l10n.spec,1.108,1.109

Than Ngo than at fedoraproject.org
Tue Jun 8 09:24:41 UTC 2010


Author: than

Update of /cvs/extras/rpms/kde-l10n/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30379

Modified Files:
	kde-l10n.spec 
Log Message:
fix file conflict with ktorrent



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/kde-l10n.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- kde-l10n.spec	6 Jun 2010 21:26:21 -0000	1.108
+++ kde-l10n.spec	8 Jun 2010 09:24:40 -0000	1.109
@@ -3,7 +3,7 @@
 
 Name: kde-l10n
 Version: 4.4.4
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -906,6 +906,10 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/ksmiletris
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/*/ksplashml
 
+# remove ktorrent.mo which conflicts with ktorrent
+# kde-l10n upstream should not include this
+rm -f %{buildroot}%{_datadir}/locale/*/*/ktorrent.mo
+
 %clean
 rm -rf %{buildroot}
 
@@ -1572,6 +1576,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 08 2010 Than Ngo <than at redhat.com> - 4.4.4-2
+- fix file conflict with ktorrent
+
 * Sun May 30 2010 Than Ngo <than at redhat.com> - 4.4.4-1
 - 4.4.4
 



More information about the scm-commits mailing list