commit d72476151e3e0097ed422f2713440adc5e401474 Author: Krzysztof Daniel kdaniel@redhat.com Date: Mon Feb 11 13:26:25 2013 +0100
Remove the main jar manifest.
Having two different jars with the same manifest is unacceptable and causes problems while building with Tycho.
icu4j-50.1.0-MANIFEST.MF | 32 -------------------------------- icu4j.spec | 13 +++++-------- 2 files changed, 5 insertions(+), 40 deletions(-) --- diff --git a/icu4j.spec b/icu4j.spec index 9bd95f3..d251146 100644 --- a/icu4j.spec +++ b/icu4j.spec @@ -46,7 +46,7 @@
Name: icu4j Version: 50.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: International Components for Unicode for Java License: MIT and EPL @@ -136,7 +136,7 @@ sed --in-place "s:/usr/lib:%{_datadir}:g" build.xml %build %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs %if %{with_eclipse} -ECLIPSE_BASE=%{eclipse_base} +ECLIPSE_BASE=/usr/lib64/eclipse pushd eclipse-build %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=${ECLIPSE_BASE} \ -Declipse.basews=gtk -Declipse.baseos=linux \ @@ -146,12 +146,6 @@ popd
%install
-# inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE2} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u %{name}.jar META-INF/MANIFEST.MF - # jars %__mkdir_p %{buildroot}%{_javadir} %__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar @@ -192,6 +186,9 @@ cp %{name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %endif
%changelog +* Mon Feb 11 2013 Krzysztof Daniel kdaniel@redhat.com 1:50.1.0-2 +- Remove the main jar manifest. + * Thu Feb 7 2013 Krzysztof Daniel kdaniel@redhat.com 1:50.1.0-1 - Update to latest upstream.