[java-sig-commits] [icu4j] Adapt to current guidelines.

[Alexander Kurtakov]

commit 21fffd999b38c2dace11b7389685caaf749f7049
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Sep 16 00:12:31 2011 +0300

    Adapt to current guidelines.
    
    Rebuild for OSGi provides.

 icu4j.spec |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/icu4j.spec b/icu4j.spec
index a5fe570..fe37e8a 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -30,8 +30,6 @@
 
 %global with_eclipse 1
 
-%global section free
-
 %global eclipse_base            %{_libdir}/eclipse
 # Note:  this next section looks weird having an arch specified in a
 # noarch specfile but the parts of the build
@@ -44,7 +42,7 @@
 
 Name:           icu4j
 Version:        4.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -64,8 +62,6 @@ BuildRequires:  java-javadoc >= 1:1.6.0
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.5
 Requires:       jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 # This is to ensure we get OpenJDK and not GCJ
 Requires:       java >= 1:1.6.0
 %if %{with_eclipse}
@@ -141,9 +137,8 @@ popd
 %__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
+%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
 
 %if %{with_eclipse}
 # eclipse
@@ -155,28 +150,19 @@ unzip -qq -d %{buildroot}/%{eclipse_base} eclipse-build/out/projects/ICU4J.com.i
 # maven stuff
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap com.ibm.icu %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %doc readme.html APIChangeReport.html
 %{_javadir}/%{name}*.jar
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*.pom
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %if %{with_eclipse}
 %files eclipse
-%defattr(-,root,root,-)
 %dir %{_libdir}/eclipse
 %dir %{_libdir}/eclipse/features
 %dir %{_libdir}/eclipse/plugins
@@ -186,6 +172,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %endif
 
 %changelog
+* Fri Sep 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.2-3
+- Adapt to current guidelines.
+
 * Mon May 9 2011 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.2-2
 - Use proper tarball.
 - Fix build.