[java-sig-commits] [apache-commons-collections] saxon dependency removed - not needed minor spec file changes according to the latest guidelines

[Jaromír Cápík]

commit 4b15a53e945205dbf24ef17513eea0912912f4af
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Feb 8 16:36:23 2012 +0100

    saxon dependency removed - not needed
    minor spec file changes according to the latest guidelines

 apache-commons-collections.spec |   46 +++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 0ca2d57..f248b8b 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.2.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Provides new interfaces, implementations and utilities for Java Collections
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -31,13 +31,9 @@ BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: ant
-BuildRequires: saxon
-BuildRequires: saxon-scripts
 BuildRequires: apache-commons-parent
 Requires:      java
 Requires:      jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
@@ -112,18 +108,22 @@ mvn-rpmbuild install javadoc:aggregate
 ant tf.javadoc
 
 %install
+
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
+install -Dm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dm 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
+
+
+# poms
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
+
+
+# fragments
+%add_maven_depmap -a "org.apache.commons:%{short_name}" JPP-%{short_name}.pom %{short_name}.jar
 %add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
 %add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
 
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -131,42 +131,38 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf target/site/apidocs
 
+
 # testframework-javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
 cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
 ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework 
 
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}.jar
 %{_javadir}/%{short_name}.jar
 
 %files testframework
-%defattr(-,root,root,-)
 %{_javadir}/%{name}-testframework.jar
 %{_javadir}/%{short_name}-testframework.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files testframework-javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-testframework-%{version}
 %{_javadocdir}/%{name}-testframework
 
+
 %changelog
+* Wed Feb 08 2012 Jaromir Capik <jcapik at redhat.com> 3.2.1-13
+- saxon dependency removed - not needed
+- minor spec file changes according to the latest guidelines
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild