rpms/koffice-langpack/F-13 koffice-langpack.spec, 1.39, 1.40 sources, 1.28, 1.29 koffice-l10n-fr-2.2.0-remove_undefined_docbook_entities.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Jul 14 15:51:54 UTC 2010 

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30400

Modified Files:
	koffice-langpack.spec sources 
Removed Files:
	koffice-l10n-fr-2.2.0-remove_undefined_docbook_entities.patch 
Log Message:
* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.2.1-1
- koffice-l10n-2.2.1



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/F-13/koffice-langpack.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- koffice-langpack.spec	25 May 2010 15:09:03 -0000	1.39
+++ koffice-langpack.spec	14 Jul 2010 15:51:54 -0000	1.40
@@ -3,7 +3,7 @@
 
 Name:           koffice-langpack
 Epoch:          2 
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
@@ -50,7 +50,7 @@ Source32:ftp://ftp.kde.org/pub/kde/stabl
 Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-pl-%{version}.tar.bz2
 Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
 Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
-#Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
 #Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
 #Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
 #Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
@@ -60,13 +60,12 @@ Source40:ftp://ftp.kde.org/pub/kde/stabl
 #Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-ta-%{version}.tar.bz2
 Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-tr-%{version}.tar.bz2
 Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-uk-%{version}.tar.bz2
-#Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-wa-%{version}.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-wa-%{version}.tar.bz2
 Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-zh_CN-%{version}.tar.bz2
 Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/koffice-l10n/koffice-l10n-zh_TW-%{version}.tar.bz2
+Source1000: subdirs-koffice-l10n
 
 ## upstreamable patches
-# needswork, hack
-Patch50: koffice-l10n-fr-2.2.0-remove_undefined_docbook_entities.patch
 
 ## upstream patches
 
@@ -76,7 +75,6 @@ BuildRequires:  libxml2
 
 Obsoletes: %{name}-fy    < 2:2.1.81-1
 Obsoletes: %{name}-hne   < 2:2.1.91-1
-Obsoletes: %{name}-wa    < 2:2.1.81-1
 
 Requires: koffice-core >= %{koffice_core_version}
 
@@ -498,9 +496,13 @@ Provides additional traditional Chinese 
 
 
 %prep
-%setup -T -c -q -n %{name} -a 4 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 20 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 45 -a 46
+%setup -T -c -q -n %{name}-%{version}
+
+for i in $(cat %{SOURCE1000}) ; do
+  echo $i | grep -v '^#' && \
+  bzip2 -dc %{_sourcedir}/koffice-l10n-$i-%{version}.tar.bz2 | tar -xf -
+done
 
-%patch50  -p0 -b .remove_undefined_docbook_entities
 
 # blacklist kivio docs, let koffice-kivio ship a matching version of them
 for koffice_lang in * ; do
@@ -529,27 +531,9 @@ rm -rf %{buildroot}
 
 for koffice_lang in * ; do
   if [ -f $koffice_lang/CMakeLists.txt ]; then
-    make -C $koffice_lang/%{_target_platform} install/fast DESTDIR=%{buildroot} 
-  fi
-done
-
-%if 0
-HTML_DIR=$(kde4-config --expandvars --install html)
-# Replace absolute symlinks with relative ones
-if [ -d %{buildroot}$HTML_DIR ]; then
-pushd %{buildroot}%{_docdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
+    make install/fast DESTDIR=%{buildroot} -C $koffice_lang/%{_target_platform}
   fi
 done
-popd
-fi
-%endif
 
 
 %clean
@@ -728,10 +712,12 @@ rm -rf %{buildroot}
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/*
 
-#files ru
-#defattr(-,root,root,-)
-#lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
-#lang(ru) %{_kde4_docdir}/HTML/ru/*
+%if 0
+%files ru
+%defattr(-,root,root,-)
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_kde4_docdir}/HTML/ru/*
+%endif
 
 #files se
 #defattr(-,root,root,-)
@@ -772,9 +758,9 @@ rm -rf %{buildroot}
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 %lang(uk) %{_kde4_docdir}/HTML/uk/*
 
-#files wa 
-#defattr(-,root,root,-)
-#lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%files wa 
+%defattr(-,root,root,-)
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
 
 %files zh_CN
 %defattr(-,root,root,-)
@@ -786,6 +772,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.2.1-1
+- koffice-l10n-2.2.1
+
 * Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.2.0-1
 - koffice-l10n-2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	25 May 2010 15:09:03 -0000	1.28
+++ sources	14 Jul 2010 15:51:54 -0000	1.29
@@ -1,23 +1,25 @@
-e0a44ee3d3caadcfa6b6a6db90a5fb8c  koffice-l10n-ca-2.2.0.tar.bz2
-8451e6a6f9944a8c4fe58fde9080b57f  koffice-l10n-da-2.2.0.tar.bz2
-e8a011b256da64d8ef59e1ce454a5f16  koffice-l10n-de-2.2.0.tar.bz2
-a33ac04422873eae59eba0b855d735ab  koffice-l10n-el-2.2.0.tar.bz2
-1f8146c4c7968bb78a3933dc56279403  koffice-l10n-en_GB-2.2.0.tar.bz2
-2c116be60eb324e01bfdc7441f3d875c  koffice-l10n-es-2.2.0.tar.bz2
-31cc914b0c2284b973557babf5a97c15  koffice-l10n-et-2.2.0.tar.bz2
-a388a79d6574b7742dd69462aa36061e  koffice-l10n-fr-2.2.0.tar.bz2
-e503c1be0f245848820a89315cddf7b1  koffice-l10n-gl-2.2.0.tar.bz2
-732513f23d468a4c59dcecee4c10996e  koffice-l10n-it-2.2.0.tar.bz2
-d7ad30b646b3cf3c2e6ebfec496a452c  koffice-l10n-ja-2.2.0.tar.bz2
-013845e0ccf0d37826aaac6c09452c42  koffice-l10n-kk-2.2.0.tar.bz2
-627cf1f003daeb421fd88d27b6c61c98  koffice-l10n-nb-2.2.0.tar.bz2
-8c79fc7cc59ade874f3f6f4d161a4e7d  koffice-l10n-nds-2.2.0.tar.bz2
-ca21886d6bcbc2adc00b2c276c4b12a0  koffice-l10n-nl-2.2.0.tar.bz2
-6068c8b3530a1827a5a61300ae009355  koffice-l10n-pl-2.2.0.tar.bz2
-d295f986978d7ffcc1a2a0cb06c0976f  koffice-l10n-pt-2.2.0.tar.bz2
-52310c259beb0182e82b5ab736cf31a8  koffice-l10n-pt_BR-2.2.0.tar.bz2
-f4b0b67e80b7a818567d863af4d84acf  koffice-l10n-sv-2.2.0.tar.bz2
-e4b34d47bb3cadcf993b10dcbfc88cb0  koffice-l10n-tr-2.2.0.tar.bz2
-20f3d8ed3a911453f8ba644a34e1cc5f  koffice-l10n-uk-2.2.0.tar.bz2
-03cad914cbfed8aa3566e89f8b29b673  koffice-l10n-zh_CN-2.2.0.tar.bz2
-ef53fbbce9785e39227e55b46ade6138  koffice-l10n-zh_TW-2.2.0.tar.bz2
+c2e522115eaff0158aae6723c9faa0df  koffice-l10n-ca-2.2.1.tar.bz2
+9d928e813ed8ad0c3071440bef374f6b  koffice-l10n-da-2.2.1.tar.bz2
+1074b8892479bf7e0a4643fb68b8d378  koffice-l10n-de-2.2.1.tar.bz2
+d5320de77c90a8964c4de8d34ff889ec  koffice-l10n-el-2.2.1.tar.bz2
+ed76b936a2a0d7149002899039b36521  koffice-l10n-en_GB-2.2.1.tar.bz2
+07b02d78f41e418599a3d14cce80812f  koffice-l10n-es-2.2.1.tar.bz2
+d0f16358983276a06c84a16cde31518c  koffice-l10n-et-2.2.1.tar.bz2
+91d1daa03ff25a9523620af77e1050f8  koffice-l10n-fr-2.2.1.tar.bz2
+77cb4ee383ed6554bfd7b04deabb5396  koffice-l10n-gl-2.2.1.tar.bz2
+edbf5ea7b84d153c5600c28a8fcbf015  koffice-l10n-it-2.2.1.tar.bz2
+fe12069da60f22909f70eedc35e3f457  koffice-l10n-ja-2.2.1.tar.bz2
+aaabd97db9aa47e9caafd491ba8bcebd  koffice-l10n-kk-2.2.1.tar.bz2
+bf40467a8d6d5f77bec7d2f3002d4260  koffice-l10n-nb-2.2.1.tar.bz2
+d74f176d046e33d743784586bd2d29ec  koffice-l10n-nds-2.2.1.tar.bz2
+c16e5d536adb36937e57fa6229cbdafa  koffice-l10n-nl-2.2.1.tar.bz2
+0fdbb0d3c7feac67b24a19a37d8daac5  koffice-l10n-pl-2.2.1.tar.bz2
+c54177bbafad4c458793244081d95496  koffice-l10n-pt-2.2.1.tar.bz2
+8c3c3bd07158cf8d93080db357757775  koffice-l10n-pt_BR-2.2.1.tar.bz2
+4ac87289a3f6d58012cce9649f39cf54  koffice-l10n-ru-2.2.1.tar.bz2
+c0a9ce94ee0986e6dd586f9d46d2c257  koffice-l10n-sv-2.2.1.tar.bz2
+24b9519402ddd9cffa20ee7d2434032a  koffice-l10n-tr-2.2.1.tar.bz2
+8a2bd84830f3d16e819a2731a70524df  koffice-l10n-uk-2.2.1.tar.bz2
+923c1301c9adea8d4adb5a70175cbd2a  koffice-l10n-wa-2.2.1.tar.bz2
+a0faf42ac46ca2023fc8921dfe426a9a  koffice-l10n-zh_CN-2.2.1.tar.bz2
+9a3ad138d38b7d330100328feec4be4c  koffice-l10n-zh_TW-2.2.1.tar.bz2


--- koffice-l10n-fr-2.2.0-remove_undefined_docbook_entities.patch DELETED ---

More information about the scm-commits mailing list