[Fedora-i18n-bugs] [eclipse-nls] - Tweaked to make rpmlint happy

[Sean Flanigan]

commit 682756ed55f52cf582f91cc29450c1e9cc6c0ccf
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Nov 29 16:44:43 2010 +1000

    - Tweaked to make rpmlint happy

 .gitignore       |    1 +
 eclipse-nls.spec |   29 ++++++++++++++---------------
 fetch-babel.sh   |    1 +
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbe4e54..56cde0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ BabelLanguagePack-3.5.0.v20100731072648.tar.bz2
 /BabelLanguagePack-3.5.0.v20100814074441.tar.bz2
 /BabelLanguagePack-3.6.0.v20100814043401.tar.bz2
 nohup.out
+/eclipse/
 /eclipse-nls/
 /.*.log
 *~
diff --git a/eclipse-nls.spec b/eclipse-nls.spec
index ac2bf58..36e42b1 100644
--- a/eclipse-nls.spec
+++ b/eclipse-nls.spec
@@ -6,13 +6,14 @@
 %define debug_package %{nil}
 
 Name: eclipse-nls 
-Summary: Babel language packs for the Eclipse platform and various plugins
+Summary: Babel language packs for the Eclipse platform and various plug-ins
+# note: try to keep this group the same as eclipse's rpm:
 Group: Text Editors/Integrated Development Environments (IDE)
 License: EPL
-URL: http://babel.eclipse.org/
+URL: http://www.eclipse.org/babel/
 
 Version: 3.6.0.v20100814043401
-Release: 1%{?dist}
+Release: 2%{?dist}
 ## The source for this package is taken from
 # http://download.eclipse.org/technology/babel/babel_language_packs/R0.8.0/helios.php
 # usage: FROM=http://download.eclipse.org/technology/babel/babel_language_packs/R0.8.0/helios.php ./fetch-babel.sh
@@ -45,9 +46,11 @@ Summary:    Eclipse/Babel language pack for %3 \
 Group:      Text Editors/Integrated Development Environments (IDE) \
 Requires:   eclipse-nls = %{version}-%{release} \
 Obsoletes:  eclipse-sdk-nls-%1 < 3.2.1-4 \
+Provides:   eclipse-sdk-nls-%1 = %{version}-%{release} \
 \
 %description %1 \
-This language pack for %3 contains user-contributed translations of the \
+This language pack for %3 \
+contains user-contributed translations of the \
 strings in all Eclipse projects. Please see the http://babel.eclipse.org/ \
 Babel project web pages for a full how-to-use explanation of these \
 translations as well as how you can contribute to \
@@ -58,16 +61,9 @@ have a translation for a given string. \
 %files %1 \
 %defattr(-,root,root,-) \
 #% {eclipse_data}/dropins/babel/eclipse/features/org.eclipse.babel.nls_*_%{2}_%{version} \
+%doc eclipse/features/*_%{2}_%{version} \
 %{eclipse_data}/dropins/babel/eclipse/plugins/*.nl_%{2}_%{version}.jar
 
-
-# Note that no licence %%doc files are listed under %%files.  Upstream 
-# does not provide a single distribution archive for eclipse-nls, but 
-# 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/eclipse/plugins directory above.
-
 %define spc() %(echo -n ' ')
 
 %lang_meta_pkg ar ar Arabic
@@ -126,7 +122,6 @@ for f in Babel*.zip; do
 done
 #mv artifacts.jar content.jar eclipse
 # also ignore site.xml for now
-rm -rf eclipse/features
 
 %build
 # nothing to build
@@ -134,13 +129,17 @@ rm -rf eclipse/features
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
-cp -a eclipse $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
+mkdir -p $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/eclipse/
+mv eclipse/plugins $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/eclipse
+find eclipse/features -type f -exec chmod 644 {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Nov 29 2010 Sean Flanigan <sflaniga at redhat.com> - 3.6.0.v20100814043401-2
+- Tweaked to make rpmlint happy
+
 * Mon Nov 29 2010 Sean Flanigan <sflaniga at redhat.com> - 3.6.0.v20100814043401-1
 - Updated from upstream to 0.8.0 (3.6.0.v20100814043401); added fa, removed en_CA
 
diff --git a/fetch-babel.sh b/fetch-babel.sh
index a94122d..7bf6703 100755
--- a/fetch-babel.sh
+++ b/fetch-babel.sh
@@ -32,3 +32,4 @@ cd ..
 tarball=BabelLanguagePack-$version.tar.bz2
 echo "Creating tarball $tarball"
 tar cjf $tarball $WORKDIR
+chmod 644 $tarball