Hello community,

here is the log from the commit of package kde4-l10n for openSUSE:Factory
checked in at Fri Jul 22 17:09:18 CEST 2011.



--------
--- KDE/kde4-l10n/kde4-l10n.changes     2011-06-03 17:22:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/kde4-l10n/kde4-l10n.changes    2011-07-21 
12:52:57.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jul 21 10:51:30 UTC 2011 - [email protected]
+
+- Update to 4.6.95 
+
+-------------------------------------------------------------------
+Fri Jul  1 11:26:23 CEST 2011 - [email protected]
+
+- update to 4.6.5
+  * Bugfixes over KDE 4.6.5
+  *  see http://kde.org/announcements/changelogs/changelog4_6_4to4_6_5.php for 
details
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kde-l10n-ar-4.6.4.tar.bz2
  kde-l10n-bg-4.6.4.tar.bz2
  kde-l10n-ca-4.6.4.tar.bz2
  [email protected]
  kde-l10n-cs-4.6.4.tar.bz2
  kde-l10n-da-4.6.4.tar.bz2
  kde-l10n-de-4.6.4.tar.bz2
  kde-l10n-el-4.6.4.tar.bz2
  kde-l10n-en_GB-4.6.4.tar.bz2
  kde-l10n-es-4.6.4.tar.bz2
  kde-l10n-et-4.6.4.tar.bz2
  kde-l10n-eu-4.6.4.tar.bz2
  kde-l10n-fi-4.6.4.tar.bz2
  kde-l10n-fr-4.6.4.tar.bz2
  kde-l10n-ga-4.6.4.tar.bz2
  kde-l10n-gl-4.6.4.tar.bz2
  kde-l10n-gu-4.6.4.tar.bz2
  kde-l10n-he-4.6.4.tar.bz2
  kde-l10n-hi-4.6.4.tar.bz2
  kde-l10n-hr-4.6.4.tar.bz2
  kde-l10n-hu-4.6.4.tar.bz2
  kde-l10n-ia-4.6.4.tar.bz2
  kde-l10n-id-4.6.4.tar.bz2
  kde-l10n-is-4.6.4.tar.bz2
  kde-l10n-it-4.6.4.tar.bz2
  kde-l10n-ja-4.6.4.tar.bz2
  kde-l10n-kdepim-4.4.5.tar.bz2
  kde-l10n-kk-4.6.4.tar.bz2
  kde-l10n-km-4.6.4.tar.bz2
  kde-l10n-kn-4.6.4.tar.bz2
  kde-l10n-ko-4.6.4.tar.bz2
  kde-l10n-lt-4.6.4.tar.bz2
  kde-l10n-lv-4.6.4.tar.bz2
  kde-l10n-mai-4.6.4.tar.bz2
  kde-l10n-nb-4.6.4.tar.bz2
  kde-l10n-nds-4.6.4.tar.bz2
  kde-l10n-nl-4.6.4.tar.bz2
  kde-l10n-nn-4.6.4.tar.bz2
  kde-l10n-pa-4.6.4.tar.bz2
  kde-l10n-pl-4.6.4.tar.bz2
  kde-l10n-pt-4.6.4.tar.bz2
  kde-l10n-pt_BR-4.6.4.tar.bz2
  kde-l10n-ro-4.6.4.tar.bz2
  kde-l10n-ru-4.6.4.tar.bz2
  kde-l10n-sk-4.6.4.tar.bz2
  kde-l10n-sl-4.6.4.tar.bz2
  kde-l10n-sr-4.6.4.tar.bz2
  kde-l10n-sv-4.6.4.tar.bz2
  kde-l10n-th-4.6.4.tar.bz2
  kde-l10n-tr-4.6.4.tar.bz2
  kde-l10n-uk-4.6.4.tar.bz2
  kde-l10n-wa-4.6.4.tar.bz2
  kde-l10n-zh_CN-4.6.4.tar.bz2
  kde-l10n-zh_TW-4.6.4.tar.bz2

New:
----
  kde-l10n-ar-4.6.95.tar.bz2
  kde-l10n-bg-4.6.95.tar.bz2
  kde-l10n-bs-4.6.95.tar.bz2
  kde-l10n-ca-4.6.95.tar.bz2
  [email protected]
  kde-l10n-cs-4.6.95.tar.bz2
  kde-l10n-da-4.6.95.tar.bz2
  kde-l10n-de-4.6.95.tar.bz2
  kde-l10n-el-4.6.95.tar.bz2
  kde-l10n-en_GB-4.6.95.tar.bz2
  kde-l10n-es-4.6.95.tar.bz2
  kde-l10n-et-4.6.95.tar.bz2
  kde-l10n-eu-4.6.95.tar.bz2
  kde-l10n-fi-4.6.95.tar.bz2
  kde-l10n-fr-4.6.95.tar.bz2
  kde-l10n-ga-4.6.95.tar.bz2
  kde-l10n-gl-4.6.95.tar.bz2
  kde-l10n-gu-4.6.95.tar.bz2
  kde-l10n-he-4.6.95.tar.bz2
  kde-l10n-hi-4.6.95.tar.bz2
  kde-l10n-hr-4.6.95.tar.bz2
  kde-l10n-hu-4.6.95.tar.bz2
  kde-l10n-ia-4.6.95.tar.bz2
  kde-l10n-id-4.6.95.tar.bz2
  kde-l10n-is-4.6.95.tar.bz2
  kde-l10n-it-4.6.95.tar.bz2
  kde-l10n-ja-4.6.95.tar.bz2
  kde-l10n-kk-4.6.95.tar.bz2
  kde-l10n-km-4.6.95.tar.bz2
  kde-l10n-kn-4.6.95.tar.bz2
  kde-l10n-ko-4.6.95.tar.bz2
  kde-l10n-lt-4.6.95.tar.bz2
  kde-l10n-lv-4.6.95.tar.bz2
  kde-l10n-mai-4.6.95.tar.bz2
  kde-l10n-nb-4.6.95.tar.bz2
  kde-l10n-nds-4.6.95.tar.bz2
  kde-l10n-nl-4.6.95.tar.bz2
  kde-l10n-nn-4.6.95.tar.bz2
  kde-l10n-pa-4.6.95.tar.bz2
  kde-l10n-pl-4.6.95.tar.bz2
  kde-l10n-pt-4.6.95.tar.bz2
  kde-l10n-pt_BR-4.6.95.tar.bz2
  kde-l10n-ro-4.6.95.tar.bz2
  kde-l10n-ru-4.6.95.tar.bz2
  kde-l10n-sk-4.6.95.tar.bz2
  kde-l10n-sl-4.6.95.tar.bz2
  kde-l10n-sr-4.6.95.tar.bz2
  kde-l10n-sv-4.6.95.tar.bz2
  kde-l10n-th-4.6.95.tar.bz2
  kde-l10n-tr-4.6.95.tar.bz2
  kde-l10n-uk-4.6.95.tar.bz2
  kde-l10n-wa-4.6.95.tar.bz2
  kde-l10n-zh_CN-4.6.95.tar.bz2
  kde-l10n-zh_TW-4.6.95.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kde4-l10n.spec ++++++
--- /var/tmp/diff_new_pack.828fzK/_old  2011-07-22 17:06:34.000000000 +0200
+++ /var/tmp/diff_new_pack.828fzK/_new  2011-07-22 17:06:34.000000000 +0200
@@ -20,82 +20,77 @@
 
 
 Name:           kde4-l10n
-BuildRequires:  cmake libkde4-devel recode update-desktop-files
-%if %suse_version > 1020
-BuildRequires:  fdupes
-%endif
+BuildRequires:  cmake fdupes libkde4-devel recode update-desktop-files
 Url:            http://l10n.kde.org/
 License:        GPL v2 or later
 Group:          System/Localization
 Summary:        English translations for KDE
-Version:        4.6.4
+Version:        4.6.95
 Release:        1
 %define kdepim_version %version
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Obsoletes:      konqueror-plugins-lang
 Source0:        kde-l10n-ar-%version.tar.bz2
 Source1:        kde-l10n-bg-%version.tar.bz2
-Source2:        kde-l10n-ca-%version.tar.bz2
-Source3:        kde-l10n-ca@valencia-%version.tar.bz2
-Source4:        kde-l10n-cs-%version.tar.bz2
-Source5:        kde-l10n-da-%version.tar.bz2
-Source6:        kde-l10n-de-%version.tar.bz2
-Source7:        kde-l10n-el-%version.tar.bz2
-Source8:        kde-l10n-en_GB-%version.tar.bz2
-Source9:        kde-l10n-es-%version.tar.bz2
-Source10:       kde-l10n-et-%version.tar.bz2
-Source11:       kde-l10n-eu-%version.tar.bz2
-Source12:       kde-l10n-fi-%version.tar.bz2
-Source13:       kde-l10n-fr-%version.tar.bz2
-Source14:       kde-l10n-ga-%version.tar.bz2
-Source15:       kde-l10n-gl-%version.tar.bz2
-Source16:       kde-l10n-gu-%version.tar.bz2
-Source17:       kde-l10n-he-%version.tar.bz2
-Source18:       kde-l10n-hi-%version.tar.bz2
-Source19:       kde-l10n-hr-%version.tar.bz2
-Source20:       kde-l10n-hu-%version.tar.bz2
-Source21:       kde-l10n-ia-%version.tar.bz2
-Source22:       kde-l10n-id-%version.tar.bz2
-Source23:       kde-l10n-is-%version.tar.bz2
-Source24:       kde-l10n-it-%version.tar.bz2
-Source25:       kde-l10n-ja-%version.tar.bz2
-Source26:       kde-l10n-kk-%version.tar.bz2
-Source27:       kde-l10n-km-%version.tar.bz2
-Source28:       kde-l10n-kn-%version.tar.bz2
-Source29:       kde-l10n-ko-%version.tar.bz2
-Source30:       kde-l10n-lt-%version.tar.bz2
-Source31:       kde-l10n-lv-%version.tar.bz2
-Source32:       kde-l10n-mai-%version.tar.bz2
-Source33:       kde-l10n-nb-%version.tar.bz2
-Source34:       kde-l10n-nds-%version.tar.bz2
-Source35:       kde-l10n-nl-%version.tar.bz2
-Source36:       kde-l10n-nn-%version.tar.bz2
-Source37:       kde-l10n-pa-%version.tar.bz2
-Source38:       kde-l10n-pl-%version.tar.bz2
-Source39:       kde-l10n-pt-%version.tar.bz2
-Source40:       kde-l10n-pt_BR-%version.tar.bz2
-Source41:       kde-l10n-ro-%version.tar.bz2
-Source42:       kde-l10n-ru-%version.tar.bz2
-Source43:       kde-l10n-sk-%version.tar.bz2
-Source44:       kde-l10n-sl-%version.tar.bz2
-Source45:       kde-l10n-sr-%version.tar.bz2
-Source46:       kde-l10n-sv-%version.tar.bz2
-Source47:       kde-l10n-th-%version.tar.bz2
-Source48:       kde-l10n-tr-%version.tar.bz2
-Source49:       kde-l10n-uk-%version.tar.bz2
-Source50:       kde-l10n-wa-%version.tar.bz2
-Source51:       kde-l10n-zh_CN-%version.tar.bz2
-Source52:       kde-l10n-zh_TW-%version.tar.bz2
+Source2:        kde-l10n-bs-%version.tar.bz2
+Source3:        kde-l10n-ca-%version.tar.bz2
+Source4:        kde-l10n-ca@valencia-%version.tar.bz2
+Source5:        kde-l10n-cs-%version.tar.bz2
+Source6:        kde-l10n-da-%version.tar.bz2
+Source7:        kde-l10n-de-%version.tar.bz2
+Source8:        kde-l10n-el-%version.tar.bz2
+Source9:        kde-l10n-en_GB-%version.tar.bz2
+Source10:       kde-l10n-es-%version.tar.bz2
+Source11:       kde-l10n-et-%version.tar.bz2
+Source12:       kde-l10n-eu-%version.tar.bz2
+Source13:       kde-l10n-fi-%version.tar.bz2
+Source14:       kde-l10n-fr-%version.tar.bz2
+Source15:       kde-l10n-ga-%version.tar.bz2
+Source16:       kde-l10n-gl-%version.tar.bz2
+Source17:       kde-l10n-gu-%version.tar.bz2
+Source18:       kde-l10n-he-%version.tar.bz2
+Source19:       kde-l10n-hi-%version.tar.bz2
+Source20:       kde-l10n-hr-%version.tar.bz2
+Source21:       kde-l10n-hu-%version.tar.bz2
+Source22:       kde-l10n-ia-%version.tar.bz2
+Source23:       kde-l10n-id-%version.tar.bz2
+Source24:       kde-l10n-is-%version.tar.bz2
+Source25:       kde-l10n-it-%version.tar.bz2
+Source26:       kde-l10n-ja-%version.tar.bz2
+Source27:       kde-l10n-kk-%version.tar.bz2
+Source28:       kde-l10n-km-%version.tar.bz2
+Source29:       kde-l10n-kn-%version.tar.bz2
+Source30:       kde-l10n-ko-%version.tar.bz2
+Source31:       kde-l10n-lt-%version.tar.bz2
+Source32:       kde-l10n-lv-%version.tar.bz2
+Source33:       kde-l10n-mai-%version.tar.bz2
+Source34:       kde-l10n-nb-%version.tar.bz2
+Source35:       kde-l10n-nds-%version.tar.bz2
+Source36:       kde-l10n-nl-%version.tar.bz2
+Source37:       kde-l10n-nn-%version.tar.bz2
+Source38:       kde-l10n-pa-%version.tar.bz2
+Source39:       kde-l10n-pl-%version.tar.bz2
+Source40:       kde-l10n-pt-%version.tar.bz2
+Source41:       kde-l10n-pt_BR-%version.tar.bz2
+Source42:       kde-l10n-ro-%version.tar.bz2
+Source43:       kde-l10n-ru-%version.tar.bz2
+Source44:       kde-l10n-sk-%version.tar.bz2
+Source45:       kde-l10n-sl-%version.tar.bz2
+Source46:       kde-l10n-sr-%version.tar.bz2
+Source47:       kde-l10n-sv-%version.tar.bz2
+Source48:       kde-l10n-th-%version.tar.bz2
+Source49:       kde-l10n-tr-%version.tar.bz2
+Source50:       kde-l10n-uk-%version.tar.bz2
+Source51:       kde-l10n-wa-%version.tar.bz2
+Source52:       kde-l10n-zh_CN-%version.tar.bz2
+Source53:       kde-l10n-zh_TW-%version.tar.bz2
 #@SOURCES@
-Source100:      COPYING
-Source101:      texts
-Source102:      update_spec.pl
-Source103:      pre_checkin.sh
-Source104:      kde-l10n-kdepim-4.4.5.tar.bz2
-%define build_languages  ar bg ca ca@valencia cs da de el en_GB es et eu fi fr 
ga gl gu he hi hr hu ia id is it ja kk km kn ko lt lv mai nb nds nl nn pa pl pt 
pt_BR ro ru sk sl sr sv th tr uk wa zh_CN zh_TW
-%define split_languages de es it ru fr sv da nl pl pt_BR
-%define kdepim44 1
+Source1000:     COPYING
+Source1001:     texts
+Source1002:     update_spec.pl
+Source1003:     pre_checkin.sh
+%define build_languages  ar bg bs ca ca@valencia cs da de el en_GB es et eu fi 
fr ga gl gu he hi hr hu ia id is it ja kk km kn ko lt lv mai nb nds nl nn pa pl 
pt pt_BR ro ru sk sl sr sv th tr uk wa zh_CN zh_TW
+%define split_languages de es et it ru fr sv da nl pl pt_BR
 
 %description
 All the requirements for a desktop in British English. This package
@@ -123,6 +118,16 @@
 All the requirements for a desktop in Bulgarian. This package contains
 application translations, help files, and screenshots.
 
+%package bs
+License:        GPL v2 or later
+Summary:        summary
+Group:          System/Localization
+Provides:       kde-l10n-bs locale(kdelibs4:bs)
+Supplements:    packageand(kdelibs4:kde3-i18n-bs)
+
+%description bs
+descr
+
 %package ca
 License:        GPL v2 or later
 Summary:        Catalan (ca) translations for KDE
@@ -285,6 +290,26 @@
 All the requirements for a desktop in Estonian. This package contains
 application translations, help files, and screenshots.
 
+%package et-doc
+Summary:        summary
+License:        GPL v2 or later
+Group:          System/Localization
+Provides:       locale(kdelibs4:et)
+Supplements:    packageand(kdelibs4:kde3-i18n-et)
+
+%description et-doc
+descr
+
+%package et-data
+Summary:        summary
+License:        GPL v2 or later
+Group:          System/Localization
+Provides:       locale(kdelibs4:et)
+Supplements:    packageand(kdelibs4:kde3-i18n-et)
+
+%description et-data
+descr
+
 %package eu
 License:        GPL v2 or later
 Summary:        Basque (eu) translations for KDE
@@ -901,67 +926,53 @@
 contains application translations, help files, and screenshots.
 
 %prep
-mkdir %name-%version
-%setup -q -D -T -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 
-b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 
-b 25 -b 26 -b 27 -b 28 -b 29 -b 30 -b 31 -b 32 -b 33 -b 34 -b 35 -b 36 -b 37 
-b 38 -b 39 -b 40 -b 41 -b 42 -b 43 -b 44 -b 45 -b 46 -b 47 -b 48 -b 49 -b 50 
-b 51 -b 52 -b 104
-#@EXTRACT@
-%if 0
-#I assume this is no longer needed as that kdepim trunk is used
-for i in %build_languages; do
-   cd ../kde-l10n-$i-%version || exit 1
-   if test "%{kdepim_version}" != "%version"; then
-     for skip in koffice kdepim; do
-       rm -rf */$skip
-       for c in */CMakeLists.txt; do
-         sed -i -e "s,add_subdirectory( *$skip *),," $c
-       done
-     done
-     for d in data docs messages; do
-       for m in kdepimlibs kdepim; do
-         if test -d ../kde-l10n-$i-%{kdepim_version}/$d/$m ; then
-           rm -rf $d/$m
-           mv ../kde-l10n-$i-%{kdepim_version}/$d/$m $d/$m
-           fgrep -q "($m)" $d/CMakeLists.txt || echo "add_subdirectory($m)" >> 
$d/CMakeLists.txt
-         fi
-       done
-     done
-   fi
-done
-%endif
+%setup -q -T -c %{name}
+for i in $RPM_SOURCE_DIR/kde-l10n-*.tar.bz2; do tar xjf $i; done
 
-# adds kdepim 4.4.5 translations  
-%if %kdepim44 == 1  
- for l in ../kde-l10n-*4.4.5; do  
-  k=`echo $l | sed 's/4.4.5/%version/g'`  
-  if [ -d $k/messages ] && [ -d $l/messages/kdepim ] ; then  
-   cp -R $l/messages/* $k/messages/  
-   sed -i -e '/add_subdirectory(kdepimlibs)/ i\add_subdirectory(kdepim)' 
$k/messages/CMakeLists.txt  
+#Create top CMakeLists.txt
+echo "cmake_minimum_required(VERSION 2.6)" >> CMakeLists.txt
+echo "project(kde-i18n)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "find_package(KDE4 REQUIRED)" >> CMakeLists.txt
+echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
+echo "include(KDE4Defaults)" >> CMakeLists.txt
+echo "include(MacroOptionalAddSubdirectory)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "if(NOT GETTEXT_MSGMERGE_EXECUTABLE)" >> CMakeLists.txt
+echo "  MESSAGE(FATAL_ERROR \"Please install the msgmerge binary\")" >> 
CMakeLists.txt
+echo "endif(NOT GETTEXT_MSGMERGE_EXECUTABLE)" >> CMakeLists.txt
+echo "if(NOT GETTEXT_MSGFMT_EXECUTABLE)" >> CMakeLists.txt
+echo "  MESSAGE(FATAL_ERROR \"Please install the msgfmt binary\")" >> 
CMakeLists.txt
+echo "endif(NOT GETTEXT_MSGFMT_EXECUTABLE)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "set(BUILD_ALL 1)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+for lang in $(ls); do
+  if [ -f $lang/CMakeLists.txt ]; then
+    echo "macro_optional_add_subdirectory($lang)" >>CMakeLists.txt
   fi  
- done
-%endif
+done
 
 %build
-for i in %build_languages; do
-  pushd ../kde-l10n-$i-%version
-    %cmake_kde4
-    %make_jobs
-  popd
+for i in $(find . -name "desktop_*.po"); do
+  rm -f $i
 done
+%cmake_kde4
+%make_jobs
 
 %install
+make DESTDIR=%{buildroot} install/fast
 for i in %build_languages; do
-  pushd ../kde-l10n-$i-%version
-    make DESTDIR=%{buildroot} install/fast
-  popd
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
 done
 
 for i in %split_languages; do
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
 
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
 done
 
 # hacks
@@ -970,37 +981,8 @@
 rm -f $RPM_BUILD_ROOT/usr/share/locale/*/index.lokalize
 
 #
-# convert man-pages from xml to utf-8:
-#
-for i in $RPM_BUILD_ROOT/usr/share/man/*/*/*.[0-9].gz
-do
-    if [ -f $i ] ; then
-          gunzip $i;
-    fi
-done
-for i in $RPM_BUILD_ROOT/usr/share/man/*/*/*.[0-9]
-do
-    if [ ! -f $i ]; then
-        break
-    fi
-    if iconv -s -c -f ascii -t ascii >/dev/null ; then
-        # it is ascii, conversion from xml to utf-8 is safe
-        recode xml..utf-8 $i
-    else
-        if iconv -s -c -f utf-8 -t utf-8 >/dev/null ; then
-            # it is already utf-8, do nothing
-            :
-        else
-            # it is iso-8859-1, conversion from xml to utf-8 is safe
-            recode xml..utf-8 $i
-        fi
-    fi
-done
-
-#
 # remove unwanted files
 #
-rm -rf ${RPM_BUILD_ROOT}/usr/share/kde4/apps/koffice
 rm -f  ${RPM_BUILD_ROOT}/opt/kde3/share/locale/*/charset
 find ${RPM_BUILD_ROOT}/usr/share/doc/kde/HTML/ -type l -name common -print0 | 
xargs -0 rm 
 #
@@ -1032,6 +1014,8 @@
    {
    echo "%defattr(-,root,root)"
    if test -d $RPM_BUILD_ROOT/usr/share/locale/$i; then
+       echo "%dir /usr/share/locale/$i"
+    echo "%dir /usr/share/locale/$i/LC_MESSAGES"
        echo "%lang($l) /usr/share/locale/$i/LC_MESSAGES/*.mo"
    fi
    if test -d $RPM_BUILD_ROOT/usr/share/locale/$i/LC_SCRIPTS; then
@@ -1058,13 +1042,6 @@
        echo "%dir /usr/share/locale/hne/LC_MESSAGES"
    fi
 
-   if [ "$i" == sr ] ; then
-       echo "%dir /usr/share/locale/sr@ijekavian"
-       echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES"
-       echo "%dir /usr/share/locale/sr@ijekavianlatin"
-       echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES"
-   fi
-
    } >> files.$l
    {
    echo "%defattr(-,root,root)"
@@ -1181,6 +1158,8 @@
 
 %files bg -f files.all.bg
 
+%files bs -f files.all.bs
+
 %files ca -f files.all.ca
 
 %files ca@valencia -f files.all.ca@valencia
@@ -1209,7 +1188,11 @@
 
 %files es-data -f files.data.es
 
-%files et -f files.all.et
+%files et -f files.et
+
+%files et-doc -f files.doc.et
+
+%files et-data -f files.data.et
 
 %files eu -f files.all.eu
 

++++++ COPYING ++++++
--- /var/tmp/diff_new_pack.828fzK/_old  2011-07-22 17:06:34.000000000 +0200
+++ /var/tmp/diff_new_pack.828fzK/_new  2011-07-22 17:06:34.000000000 +0200
@@ -1,12 +1,13 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                          51 Franklin Street, Fifth Floor,
+                          Boston, MA 02110-1301, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +57,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                   GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +256,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                           NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +278,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                    END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-           How to Apply These Terms to Your New Programs
+        Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +292,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -304,16 +305,15 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

++++++ kde-l10n-ar-4.6.4.tar.bz2 -> kde-l10n-ar-4.6.95.tar.bz2 ++++++
++++ 201085 lines of diff (skipped)

++++++ kde-l10n-bg-4.6.4.tar.bz2 -> kde-l10n-bg-4.6.95.tar.bz2 ++++++
++++ 182233 lines of diff (skipped)

++++++ kde-l10n-cs-4.6.4.tar.bz2 -> kde-l10n-bs-4.6.95.tar.bz2 ++++++
++++ 573519 lines of diff (skipped)

++++++ kde-l10n-ca-4.6.4.tar.bz2 -> kde-l10n-ca-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-ca-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-ca-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ [email protected] -> 
[email protected] ++++++
++++ 207518 lines of diff (skipped)

++++++ kde-l10n-cs-4.6.4.tar.bz2 -> kde-l10n-cs-4.6.95.tar.bz2 ++++++
++++ 208319 lines of diff (skipped)

++++++ kde-l10n-da-4.6.4.tar.bz2 -> kde-l10n-da-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-da-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-da-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-de-4.6.4.tar.bz2 -> kde-l10n-de-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-de-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-de-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-el-4.6.4.tar.bz2 -> kde-l10n-el-4.6.95.tar.bz2 ++++++
++++ 220067 lines of diff (skipped)

++++++ kde-l10n-en_GB-4.6.4.tar.bz2 -> kde-l10n-en_GB-4.6.95.tar.bz2 ++++++
++++ 216060 lines of diff (skipped)

++++++ kde-l10n-es-4.6.4.tar.bz2 -> kde-l10n-es-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-es-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-es-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-et-4.6.4.tar.bz2 -> kde-l10n-et-4.6.95.tar.bz2 ++++++
++++ 242457 lines of diff (skipped)

++++++ kde-l10n-eu-4.6.4.tar.bz2 -> kde-l10n-eu-4.6.95.tar.bz2 ++++++
++++ 189605 lines of diff (skipped)

++++++ kde-l10n-fi-4.6.4.tar.bz2 -> kde-l10n-fi-4.6.95.tar.bz2 ++++++
++++ 206304 lines of diff (skipped)

++++++ kde-l10n-fr-4.6.4.tar.bz2 -> kde-l10n-fr-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-fr-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-fr-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-ga-4.6.4.tar.bz2 -> kde-l10n-ga-4.6.95.tar.bz2 ++++++
++++ 225762 lines of diff (skipped)

++++++ kde-l10n-gl-4.6.4.tar.bz2 -> kde-l10n-gl-4.6.95.tar.bz2 ++++++
++++ 243825 lines of diff (skipped)

++++++ kde-l10n-gu-4.6.4.tar.bz2 -> kde-l10n-gu-4.6.95.tar.bz2 ++++++
++++ 130926 lines of diff (skipped)

++++++ kde-l10n-he-4.6.4.tar.bz2 -> kde-l10n-he-4.6.95.tar.bz2 ++++++
++++ 134547 lines of diff (skipped)

++++++ kde-l10n-hi-4.6.4.tar.bz2 -> kde-l10n-hi-4.6.95.tar.bz2 ++++++
++++ 195063 lines of diff (skipped)

++++++ kde-l10n-hr-4.6.4.tar.bz2 -> kde-l10n-hr-4.6.95.tar.bz2 ++++++
++++ 207222 lines of diff (skipped)

++++++ kde-l10n-hu-4.6.4.tar.bz2 -> kde-l10n-hu-4.6.95.tar.bz2 ++++++
++++ 213972 lines of diff (skipped)

++++++ kde-l10n-ia-4.6.4.tar.bz2 -> kde-l10n-ia-4.6.95.tar.bz2 ++++++
++++ 103167 lines of diff (skipped)

++++++ kde-l10n-id-4.6.4.tar.bz2 -> kde-l10n-id-4.6.95.tar.bz2 ++++++
++++ 50540 lines of diff (skipped)

++++++ kde-l10n-is-4.6.4.tar.bz2 -> kde-l10n-is-4.6.95.tar.bz2 ++++++
++++ 196197 lines of diff (skipped)

++++++ kde-l10n-it-4.6.4.tar.bz2 -> kde-l10n-it-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-it-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-it-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-ja-4.6.4.tar.bz2 -> kde-l10n-ja-4.6.95.tar.bz2 ++++++
++++ 192944 lines of diff (skipped)

++++++ kde-l10n-kk-4.6.4.tar.bz2 -> kde-l10n-kk-4.6.95.tar.bz2 ++++++
++++ 171681 lines of diff (skipped)

++++++ kde-l10n-km-4.6.4.tar.bz2 -> kde-l10n-km-4.6.95.tar.bz2 ++++++
++++ 209218 lines of diff (skipped)

++++++ kde-l10n-kn-4.6.4.tar.bz2 -> kde-l10n-kn-4.6.95.tar.bz2 ++++++
++++ 43268 lines of diff (skipped)

++++++ kde-l10n-ko-4.6.4.tar.bz2 -> kde-l10n-ko-4.6.95.tar.bz2 ++++++
++++ 158465 lines of diff (skipped)

++++++ kde-l10n-lt-4.6.4.tar.bz2 -> kde-l10n-lt-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-lt-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-lt-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-lv-4.6.4.tar.bz2 -> kde-l10n-lv-4.6.95.tar.bz2 ++++++
++++ 199969 lines of diff (skipped)

++++++ kde-l10n-mai-4.6.4.tar.bz2 -> kde-l10n-mai-4.6.95.tar.bz2 ++++++
++++ 175774 lines of diff (skipped)

++++++ kde-l10n-nb-4.6.4.tar.bz2 -> kde-l10n-nb-4.6.95.tar.bz2 ++++++
++++ 205208 lines of diff (skipped)

++++++ kde-l10n-nds-4.6.4.tar.bz2 -> kde-l10n-nds-4.6.95.tar.bz2 ++++++
++++ 214033 lines of diff (skipped)

++++++ kde-l10n-nl-4.6.4.tar.bz2 -> kde-l10n-nl-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-nl-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-nl-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-nn-4.6.4.tar.bz2 -> kde-l10n-nn-4.6.95.tar.bz2 ++++++
++++ 198650 lines of diff (skipped)

++++++ kde-l10n-pa-4.6.4.tar.bz2 -> kde-l10n-pa-4.6.95.tar.bz2 ++++++
++++ 220345 lines of diff (skipped)

++++++ kde-l10n-pl-4.6.4.tar.bz2 -> kde-l10n-pl-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-pl-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-pl-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-pt-4.6.4.tar.bz2 -> kde-l10n-pt-4.6.95.tar.bz2 ++++++
++++ 227470 lines of diff (skipped)

++++++ kde-l10n-pt_BR-4.6.4.tar.bz2 -> kde-l10n-pt_BR-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-pt_BR-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-pt_BR-4.6.95.tar.bz2 differ: 
char 11, line 1

++++++ kde-l10n-ro-4.6.4.tar.bz2 -> kde-l10n-ro-4.6.95.tar.bz2 ++++++
++++ 214441 lines of diff (skipped)

++++++ kde-l10n-ru-4.6.4.tar.bz2 -> kde-l10n-ru-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-ru-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-ru-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-sk-4.6.4.tar.bz2 -> kde-l10n-sk-4.6.95.tar.bz2 ++++++
++++ 208599 lines of diff (skipped)

++++++ kde-l10n-sl-4.6.4.tar.bz2 -> kde-l10n-sl-4.6.95.tar.bz2 ++++++
++++ 221522 lines of diff (skipped)

++++++ kde-l10n-sr-4.6.4.tar.bz2 -> kde-l10n-sr-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-sr-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-sr-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-sv-4.6.4.tar.bz2 -> kde-l10n-sv-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-sv-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-sv-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-th-4.6.4.tar.bz2 -> kde-l10n-th-4.6.95.tar.bz2 ++++++
++++ 166968 lines of diff (skipped)

++++++ kde-l10n-tr-4.6.4.tar.bz2 -> kde-l10n-tr-4.6.95.tar.bz2 ++++++
++++ 206985 lines of diff (skipped)

++++++ kde-l10n-uk-4.6.4.tar.bz2 -> kde-l10n-uk-4.6.95.tar.bz2 ++++++
KDE/kde4-l10n/kde-l10n-uk-4.6.4.tar.bz2 
/mounts/work_src_done/STABLE/kde4-l10n/kde-l10n-uk-4.6.95.tar.bz2 differ: char 
11, line 1

++++++ kde-l10n-wa-4.6.4.tar.bz2 -> kde-l10n-wa-4.6.95.tar.bz2 ++++++
++++ 95449 lines of diff (skipped)

++++++ kde-l10n-zh_CN-4.6.4.tar.bz2 -> kde-l10n-zh_CN-4.6.95.tar.bz2 ++++++
++++ 210428 lines of diff (skipped)

++++++ kde-l10n-zh_TW-4.6.4.tar.bz2 -> kde-l10n-zh_TW-4.6.95.tar.bz2 ++++++
++++ 203705 lines of diff (skipped)

++++++ kde4-l10n.spec.in ++++++
--- /var/tmp/diff_new_pack.828fzK/_old  2011-07-22 17:07:24.000000000 +0200
+++ /var/tmp/diff_new_pack.828fzK/_new  2011-07-22 17:07:24.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package kde4-l10n (Version 4.5.90)
+# spec file for package kde4-l10n (Version svn)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,29 +19,23 @@
 # icecream 0
 
 Name:           kde4-l10n
-BuildRequires:  cmake libkde4-devel recode update-desktop-files
-%if %suse_version > 1020
-BuildRequires:  fdupes
-%endif
+BuildRequires:  cmake libkde4-devel recode update-desktop-files fdupes
 Url:            http://l10n.kde.org/
 License:        GPL v2 or later
 Group:          System/Localization
 Summary:        English translations for KDE
-Version:        4.6.4
+Version:        4.6.95
 Release:        1
 %define kdepim_version %version
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Obsoletes:     konqueror-plugins-lang
 #@SOURCES@
-Source100:      COPYING
-Source101:      texts
-Source102:      update_spec.pl
-Source103:      pre_checkin.sh
-Source104:      kde-l10n-kdepim-4.4.5.tar.bz2
+Source1000:      COPYING
+Source1001:      texts
+Source1002:      update_spec.pl
+Source1003:      pre_checkin.sh
 %define build_languages @LANGUAGES@
 %define split_languages @SPLITLANGS@
-%define kdepim44 1
 
 %description
 All the requirements for a translated desktop. This package 
@@ -50,67 +44,55 @@
 #@PACKAGES@
 
 %prep
-mkdir %name-%version
-%setup -q @SETUP_LIST@ -b 104
-#@EXTRACT@
-%if 0
-#I assume this is no longer needed as that kdepim trunk is used
-for i in %build_languages; do
-   cd ../kde-l10n-$i-%version || exit 1
-   if test "%{kdepim_version}" != "%version"; then
-     for skip in koffice kdepim; do
-       rm -rf */$skip
-       for c in */CMakeLists.txt; do
-         sed -i -e "s,add_subdirectory( *$skip *),," $c
-       done
-     done
-     for d in data docs messages; do
-       for m in kdepimlibs kdepim; do
-         if test -d ../kde-l10n-$i-%{kdepim_version}/$d/$m ; then
-           rm -rf $d/$m
-           mv ../kde-l10n-$i-%{kdepim_version}/$d/$m $d/$m
-           fgrep -q "($m)" $d/CMakeLists.txt || echo "add_subdirectory($m)" >> 
$d/CMakeLists.txt
-         fi
-       done
-     done
-   fi
+%setup -q -T -c %{name}
+for i in $RPM_SOURCE_DIR/kde-l10n-*.tar.bz2; do tar xjf $i; done
+
+#Create top CMakeLists.txt
+echo "cmake_minimum_required(VERSION 2.6)" >> CMakeLists.txt
+echo "project(kde-i18n)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "find_package(KDE4 REQUIRED)" >> CMakeLists.txt
+echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
+echo "include(KDE4Defaults)" >> CMakeLists.txt
+echo "include(MacroOptionalAddSubdirectory)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "if(NOT GETTEXT_MSGMERGE_EXECUTABLE)" >> CMakeLists.txt
+echo "  MESSAGE(FATAL_ERROR \"Please install the msgmerge binary\")" >> 
CMakeLists.txt
+echo "endif(NOT GETTEXT_MSGMERGE_EXECUTABLE)" >> CMakeLists.txt
+echo "if(NOT GETTEXT_MSGFMT_EXECUTABLE)" >> CMakeLists.txt
+echo "  MESSAGE(FATAL_ERROR \"Please install the msgfmt binary\")" >> 
CMakeLists.txt
+echo "endif(NOT GETTEXT_MSGFMT_EXECUTABLE)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+echo "set(BUILD_ALL 1)" >> CMakeLists.txt
+echo "" >> CMakeLists.txt
+for lang in $(ls); do
+  if [ -f $lang/CMakeLists.txt ]; then
+    echo "macro_optional_add_subdirectory($lang)" >>CMakeLists.txt
+  fi
 done
-%endif
 
-# adds kdepim 4.4.5 translations  
-%if %kdepim44 == 1  
- for l in ../kde-l10n-*4.4.5; do  
-  k=`echo $l | sed 's/4.4.5/%version/g'`  
-  if [ -d $k/messages ] && [ -d $l/messages/kdepim ] ; then  
-   cp -R $l/messages/* $k/messages/  
-   sed -i -e '/add_subdirectory(kdepimlibs)/ i\add_subdirectory(kdepim)' 
$k/messages/CMakeLists.txt  
-  fi  
- done
-%endif
 
 %build
-for i in %build_languages; do
-  pushd ../kde-l10n-$i-%version
-    %cmake_kde4
-    %make_jobs
-  popd
+for i in $(find . -name "desktop_*.po"); do
+  rm -f $i
 done
+%cmake_kde4
+%make_jobs
+
 
 %install
+make DESTDIR=%{buildroot} install/fast
 for i in %build_languages; do
-  pushd ../kde-l10n-$i-%version
-    make DESTDIR=%{buildroot} install/fast
-  popd
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i
 done
 
 for i in %split_languages; do
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-doc
 
   mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
-  install -m 644 %{SOURCE100} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
+  install -m 644 %{SOURCE1000} 
$RPM_BUILD_ROOT/usr/share/doc/packages/kde4-l10n-$i-data
 done
 
 
@@ -120,37 +102,8 @@
 rm -f $RPM_BUILD_ROOT/usr/share/locale/*/index.lokalize
 
 #
-# convert man-pages from xml to utf-8:
-#
-for i in $RPM_BUILD_ROOT/usr/share/man/*/*/*.[0-9].gz
-do
-    if [ -f $i ] ; then
-          gunzip $i;
-    fi
-done
-for i in $RPM_BUILD_ROOT/usr/share/man/*/*/*.[0-9]
-do
-    if [ ! -f $i ]; then
-        break
-    fi
-    if iconv -s -c -f ascii -t ascii >/dev/null ; then
-        # it is ascii, conversion from xml to utf-8 is safe
-        recode xml..utf-8 $i
-    else
-        if iconv -s -c -f utf-8 -t utf-8 >/dev/null ; then
-            # it is already utf-8, do nothing
-            :
-        else
-            # it is iso-8859-1, conversion from xml to utf-8 is safe
-            recode xml..utf-8 $i
-        fi
-    fi
-done
-
-#
 # remove unwanted files
 #
-rm -rf ${RPM_BUILD_ROOT}/usr/share/kde4/apps/koffice
 rm -f  ${RPM_BUILD_ROOT}/opt/kde3/share/locale/*/charset
 find ${RPM_BUILD_ROOT}/usr/share/doc/kde/HTML/ -type l -name common -print0 | 
xargs -0 rm 
 #
@@ -182,6 +135,8 @@
    {
    echo "%defattr(-,root,root)"
    if test -d $RPM_BUILD_ROOT/usr/share/locale/$i; then
+       echo "%dir /usr/share/locale/$i"
+    echo "%dir /usr/share/locale/$i/LC_MESSAGES"
        echo "%lang($l) /usr/share/locale/$i/LC_MESSAGES/*.mo"
    fi
    if test -d $RPM_BUILD_ROOT/usr/share/locale/$i/LC_SCRIPTS; then
@@ -208,13 +163,6 @@
        echo "%dir /usr/share/locale/hne/LC_MESSAGES"
    fi
 
-   if [ "$i" == sr ] ; then
-       echo "%dir /usr/share/locale/sr@ijekavian"
-       echo "%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES"
-       echo "%dir /usr/share/locale/sr@ijekavianlatin"
-       echo "%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES"
-   fi
-
    } >> files.$l
    {
    echo "%defattr(-,root,root)"
@@ -332,4 +280,4 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%changelog -n kde4-l10n
+%changelog

++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.828fzK/_old  2011-07-22 17:07:24.000000000 +0200
+++ /var/tmp/diff_new_pack.828fzK/_new  2011-07-22 17:07:24.000000000 +0200
@@ -6,14 +6,12 @@
 
 cp kde4-l10n.spec.in kde4-l10n.spec
 
-#for lang in `ls -1 kde-l10n*tar.bz2 | sed -n 's,kde-l10n-\([^-]*\)-.*,\1,p'`; 
do
-# ignore kdepim4.4.5
-for lang in `ls -1 kde-l10n*tar.bz2 | sed -n 's,kde-l10n-\([^-]*\)-.*,\1,p' | 
grep -v kdepim`; do
+for lang in `ls -1 kde-l10n*tar.bz2 | sed -n 's,kde-l10n-\([^-]*\)-.*,\1,p'`; 
do
   languages="$languages $lang"
 done
 
 # if the tar is ~ >10MB - do not automate to avoid ping pong between dot 
releases
-splitlanguages="de es it ru fr sv da nl pl pt_BR"
+splitlanguages="de es et it ru fr sv da nl pl pt_BR"
 sed="s,@LANGUAGES@,$languages,"
 sed="$sed; s,@SPLITLANGS@,$splitlanguages,"
 sed -i -e "$sed" kde4-l10n.spec


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to