rpms/kde-i18n/devel kde-i18n.spec,1.57,1.58

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 13 13:39:47 UTC 2006


Author: than

Update of /cvs/dist/rpms/kde-i18n/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19417

Modified Files:
	kde-i18n.spec 
Log Message:
fix file conflict




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-i18n.spec	6 Apr 2006 12:58:36 -0000	1.57
+++ kde-i18n.spec	13 Apr 2006 13:39:44 -0000	1.58
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.2
-Release: 1
+Release: 2
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -639,28 +639,24 @@
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
-    if [ ! -d common ] ; then
-      ln -s ../en/common common
-    fi
-
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../common $i
+        ln -sf ../../../$lang/docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../common $i
+        ln -sf ../../$lang/docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../common $i
+        ln -sf ../$lang/docs/common $i
       fi
     done
 
@@ -1154,6 +1150,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-2 
+- fix file conflict
+
 * Mon Apr 03 2006 Than Ngo <than at redhat.com> 1:3.5.2-1
 - update to 3.5.2
 




More information about the fedora-cvs-commits mailing list