[eclipse-nls] keep fedora package noarch, but only build for eclipse archs for rhel

Jens Petersen petersen at fedoraproject.org
Fri Feb 3 02:40:15 UTC 2012


commit 752b7919ad5971857eeb277602170a357c9700d2
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Feb 3 11:40:09 2012 +0900

    keep fedora package noarch, but only build for eclipse archs for rhel

 eclipse-nls.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/eclipse-nls.spec b/eclipse-nls.spec
index 9aea678..2c1dcf6 100644
--- a/eclipse-nls.spec
+++ b/eclipse-nls.spec
@@ -13,22 +13,26 @@ License: EPL
 URL: http://www.eclipse.org/babel/
 
 Version: 3.6.0.v20100814043401
-Release: 6%{?dist}
+Release: 7%{?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
 Source0: BabelLanguagePack-%{version}.tar.bz2
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{defined fedora}
 BuildArch:  noarch
+%endif
 Requires:   eclipse-platform >= 3.6
 
+%if 0%{?rhel} >= 6
+ExclusiveArch: %{ix86} x86_64
+%endif
+
 %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
@@ -59,7 +63,6 @@ Note that English text will be displayed if Babel doesn't \
 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
@@ -127,16 +130,15 @@ done
 # nothing to build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 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
+* Fri Feb  3 2012 Jens Petersen <petersen at redhat.com> - 3.6.0.v20100814043401-7
+- keep fedora package noarch, but only build for eclipse archs for rhel
+- clean away deprecated buildroot and defattr lines
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0.v20100814043401-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list