commit cc11ab97eeb731100db70f7790db5d30f4a6a374
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Tue Feb 12 08:33:18 2013 +0100
SCLize.
icu4j.spec | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/icu4j.spec b/icu4j.spec
index 31ca5ef..0d5bb02 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -28,6 +28,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%{?scl:%scl_package icu4j}
+%{!?scl:%global pkg_name %{name}}
+%{!?scl:%global _scl_root %{nil}}
+
+
%global with_eclipse 1
%if 0%{?rhel}
@@ -44,9 +49,9 @@
%global eclipse_arch %{_arch}
%endif
-Name: icu4j
+Name: %{?scl_prefix}icu4j
Version: 50.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -57,9 +62,9 @@ Group: Development/Libraries
#svn co
http://source.icu-project.org/repos/icu/icu4j/tags/release-4-4-2-eclipse3...
icu4j-<version>
#tar caf icu4j-<version>.tar.xz icu4j-<version>/
Source0: icu4j-50.1.0.tar.xz
-Source1: %{name}-50.1.0.pom
+Source1: %{pkg_name}-50.1.0.pom
-Patch0: %{name}-crosslink.patch
+Patch0: %{pkg_name}-crosslink.patch
BuildRequires: ant >= 1.7.0
# FIXME: is this necessary or is it just adding strings in the hrefs in
# the docs?
@@ -69,6 +74,7 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: zip
Requires: jpackage-utils
+%{?scl:Requires: %scl_runtime}
# This is to ensure we get OpenJDK and not GCJ
Requires: java >= 1:1.6.0
%if %{with_eclipse}
@@ -95,27 +101,27 @@ richer APIs, while remaining as compatible as possible with the
original
Java text and internationalization API design.
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{pkg_name}
Group: Documentation
Requires: jpackage-utils
Requires: java-javadoc >= 1:1.6.0
%description javadoc
-Javadoc for %{name}.
+Javadoc for %{pkg_name}.
%if %{with_eclipse}
%package eclipse
-Summary: Eclipse plugin for %{name}
+Summary: Eclipse plugin for %{pkg_name}
Group: Development/Libraries
Requires: jpackage-utils
%description eclipse
-Eclipse plugin support for %{name}.
+Eclipse plugin support for %{pkg_name}.
%endif
%prep
-%setup -q
+%setup -q -n %{pkg_name}-%{version}
#%patch0 -p0
cp %{SOURCE1} .
@@ -143,11 +149,11 @@ popd
# jars
%__mkdir_p %{buildroot}%{_javadir}
-%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+%__cp -ap %{pkg_name}.jar %{buildroot}%{_javadir}/%{pkg_name}.jar
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
-%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
+%__mkdir_p %{buildroot}%{_javadocdir}/%{pkg_name}
+%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{pkg_name}
%if %{with_eclipse}
# eclipse
@@ -158,12 +164,12 @@ unzip -qq -d %{buildroot}%{_javadir}/icu4j-eclipse
eclipse-build/out/projects/IC
# maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-cp %{name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+cp %{pkg_name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom
+%add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar
%files
%doc readme.html APIChangeReport.html
-%{_javadir}/%{name}*.jar
+%{_javadir}/%{pkg_name}*.jar
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
@@ -181,6 +187,9 @@ cp %{name}-%{version}.pom
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%endif
%changelog
+* Tue Feb 12 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:50.1.0-5
+- SCLize.
+
* Mon Feb 11 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1:50.1.0-4
- Revert a hardcoded path.