rpms/eclipse-nls/devel .cvsignore, 1.3, 1.4 eclipse-nls.spec, 1.3, 1.4 sources, 1.3, 1.4

[Sean Flanigan]

Author: seanf

Update of /cvs/pkgs/rpms/eclipse-nls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv981

Modified Files:
	.cvsignore eclipse-nls.spec sources 
Log Message:
- Updated from upstream; added Estonian.
- Fixed names/descriptions for languages with two word names such as
- "Portuguese (Brazilian)".
- Added Babel metadata files (artifact.jar and content.jar) to make P2
- happier (presently disabled)
- Made the base package owner of dropins/babel and subdirectories



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Apr 2009 06:03:38 -0000	1.3
+++ .cvsignore	27 May 2009 05:17:37 -0000	1.4
@@ -1 +1 @@
-BabelLanguagePack-3.5.0.v20090417091040.tar.bz2
+BabelLanguagePack-3.5.0.v20090423085802.tar.bz2


Index: eclipse-nls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/eclipse-nls.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-nls.spec	23 Apr 2009 05:53:31 -0000	1.3
+++ eclipse-nls.spec	27 May 2009 05:17:37 -0000	1.4
@@ -9,22 +9,41 @@ Group: Text Editors/Integrated Developme
 License: EPL
 URL: http://babel.eclipse.org/
 
-Version: 3.5.0.v20090417091040
+Version: 3.5.0.v20090423085802
 Release: 1%{?dist}
-## The source for this package is taken from http://download.eclipse.org/technology/babel/babel_language_packs/
+## The source for this package is taken from
+# http://download.eclipse.org/technology/babel/babel_language_packs/ *.zip
+# and http://download.eclipse.org/technology/babel/update-site/galileo/{artifacts,content}.jar
+# or http://build.eclipse.org/technology/babel/test-updates/galileo/{artifacts,content}.jar
+# or http://download.eclipse.org/technology/babel/update-site/galileo/site.xml
 Source0: BabelLanguagePack-%{version}.tar.bz2
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
+Requires:   eclipse-platform >= 3.4.0-18
 
 %description
 Babel language packs include translations for the Eclipse platform and other 
 Eclipse-related packages.
 
+%files
+%defattr(-,root,root,-)
+%dir %{eclipse_data}/dropins/babel
+%dir %{eclipse_data}/dropins/babel/eclipse
+#% {eclipse_data}/dropins/babel/eclipse/artifacts.jar
+#% {eclipse_data}/dropins/babel/eclipse/content.jar
+#% dir %{eclipse_data}/dropins/babel/eclipse/features
+%dir %{eclipse_data}/dropins/babel/eclipse/plugins
+
+
+# %1 subpackage id (ie Linux locale id)
+# %2 Java locale id (mostly the same as Linux)
+# %3 language name
 %define lang_meta_pkg() \
 %package %1 \
 Summary:    Eclipse/Babel language pack for %3 \
 Group:      Text Editors/Integrated Development Environments (IDE) \
-Requires:   eclipse-platform >= 3.4.0-18 \
+Requires:   eclipse-nls = %{version}-%{release} \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
 \
 %description %1 \
@@ -38,13 +57,8 @@ have a translation for a given string. \
 \
 %files %1 \
 %defattr(-,root,root,-) \
-%dir %{eclipse_data}/dropins/babel \
-%dir %{eclipse_data}/dropins/babel/eclipse \
-%dir %{eclipse_data}/dropins/babel/eclipse/features \
-%{eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
-%dir %{eclipse_data}/dropins/babel/eclipse/plugins \
+#% {eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
 %{eclipse_data}/dropins/babel/eclipse/plugins/*.nl_%{2}_%{version}.jar
-# %{eclipse_data}/dropins/babel-%1
 
 
 # Note that no licence %%doc files are listed under %%files.  Upstream 
@@ -52,21 +66,24 @@ have a translation for a given string. \
 # rather a collection of 700 zips, one per module/language combination, 
 # containing multiple plugin jars.  Each jar does include HTML files 
 # with licence information, and these jars are placed in the 
-# dropins/babel-* directory above.
+# dropins/babel/eclipse/plugins directory above.
+
+%define spc() %(echo -n ' ')
 
 %lang_meta_pkg ar ar Arabic
 %lang_meta_pkg bg bg Bulgarian
-%lang_meta_pkg zh zh "Chinese (Simplified)"
-%lang_meta_pkg zh_TW zh_TW "Chinese (Traditional)"
+%lang_meta_pkg zh zh Chinese%{spc}(Simplified)
+%lang_meta_pkg zh_TW zh_TW Chinese%{spc}(Traditional)
 %lang_meta_pkg cs cs Czech
 %lang_meta_pkg da da Danish
 %lang_meta_pkg nl nl Dutch
-%lang_meta_pkg en_AU en_AU "English (Australian)"
+%lang_meta_pkg en_AU en_AU English%{spc}(Australian)
+%lang_meta_pkg et et Estonian
 %lang_meta_pkg fi fi Finnish
 %lang_meta_pkg fr fr French
 %lang_meta_pkg de de German
 %lang_meta_pkg el el Greek
-# NB 'he' is 'iw' as far as Java is concerned.  fetch-babel.sh knows about it
+# NB 'he' is 'iw' as far as Java is concerned.
 # similarly, yi -> ji, id -> in
 %lang_meta_pkg he iw Hebrew
 %lang_meta_pkg hi hi Hindi
@@ -80,28 +97,33 @@ have a translation for a given string. \
 %lang_meta_pkg no no Norwegian
 %lang_meta_pkg pl pl Polish
 %lang_meta_pkg pt pt Portuguese
-%lang_meta_pkg pt_BR pt_BR "Portuguese (Brazilian)"
+%lang_meta_pkg pt_BR pt_BR Portuguese%{spc}(Brazilian)
 %lang_meta_pkg ro ro Romanian
 %lang_meta_pkg ru ru Russian
 %lang_meta_pkg es es Spanish
 %lang_meta_pkg sv sv Swedish
 %lang_meta_pkg tr tr Turkish
 %lang_meta_pkg uk uk Ukrainian
-%lang_meta_pkg en_AA en_AA "Pseudo Translations"
+%lang_meta_pkg en_AA en_AA Pseudo%{spc}Translations
 
 %prep
 # extract langpack zips from tarball
 %setup -q -n %{name}
+#mkdir -p eclipse/features
+mkdir -p eclipse/plugins
 # remove unsupported langpacks (currently Klingon)
 unsupported="tl"
 for locale in $unsupported; do
-   rm Babel*-${locale}_%{version}.zip
+   rm -f Babel*-${locale}_%{version}.zip
 done
 # extract remaining zips - to eclipse/{features,plugins}
 for f in Babel*.zip; do
    unzip -qq $f
    rm $f
 done
+#mv artifacts.jar content.jar eclipse
+# also ignore site.xml for now
+rm -rf eclipse/features
 
 %build
 # nothing to build
@@ -116,6 +138,12 @@ cp -a eclipse $RPM_BUILD_ROOT%{eclipse_d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed May 27 2009 Sean Flanigan <sflaniga at redhat.com> - 3.5.0.v20090423085802-1
+- Updated from upstream; added Estonian.
+- Fixed names/descriptions for languages with two word names such as "Portuguese (Brazilian)".
+- Added Babel metadata files (artifact.jar and content.jar) to make P2 happier (presently disabled)
+- Made the base package owner of dropins/babel and subdirectories
+
 * Thu Apr 23 2009 Sean Flanigan <sflaniga at redhat.com> - 3.5.0.v20090417091040-1
 - Updated to use Babel's zipped langpacks instead of fetch-babel.sh
 - Changed versioning scheme to match changes in upstream versioning


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-nls/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Apr 2009 06:03:38 -0000	1.3
+++ sources	27 May 2009 05:17:37 -0000	1.4
@@ -1 +1 @@
-afac0e98bd964bdabff2918989044fe5  BabelLanguagePack-3.5.0.v20090417091040.tar.bz2
+7260aaac0acd3f25fdd4049f6146f67b  BabelLanguagePack-3.5.0.v20090423085802.tar.bz2