[apache-commons-compress] new upstream version 1.2

Thu Aug 4 08:43:55 UTC 2011

commit b545e8c03cbaca46539389c2266403acca26fa9d
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Thu Aug 4 10:43:12 2011 +0200

    new upstream version 1.2

 .gitignore                   |    1 +
 apache-commons-compress.spec |  104 ++++++++++++++++++++++++++++--------------
 sources                      |    2 +-
 3 files changed, 71 insertions(+), 36 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b6c1ccf..79a35b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 commons-compress-1.0-src.tar.gz
 /commons-compress-1.1-src.tar.gz
+/commons-compress-1.2-src.tar.gz
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 47885a1..5ae40f8 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -1,28 +1,40 @@
-%global base_name       compress
-%global short_name      commons-%{base_name}
+%global shortname commons-compress
 
-Name:             apache-%{short_name}
-Version:          1.1
+Name:             apache-%{shortname}
+Version:          1.2
 Release:          1%{?dist}
 Summary:          Java API for working with tar, zip and bzip2 files
 Group:            Development/Libraries
 License:          ASL 2.0
-URL:              http://commons.apache.org/%{base_name}/
-Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+URL:              http://commons.apache.org/compress/
+Source0:          http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz
 BuildArch:        noarch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    apache-commons-parent
+BuildRequires:    maven2
+BuildRequires:    maven2-plugin-antrun
+BuildRequires:    maven2-plugin-assembly
+BuildRequires:    maven2-plugin-compiler
+BuildRequires:    maven2-plugin-idea
+BuildRequires:    maven2-plugin-install
+BuildRequires:    maven2-plugin-jar
+BuildRequires:    maven2-plugin-javadoc
+BuildRequires:    maven2-plugin-resources
+BuildRequires:    maven2-plugin-source
+BuildRequires:    maven-doxia-sitetools
+BuildRequires:    maven-plugin-bundle
+BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    maven-surefire-provider-junit
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires(post):   jpackage-utils
 Requires(postun): jpackage-utils
 
-
 # Upstream name change
-Provides:         jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:        jakarta-%{short_name} < 1.0-2
+Provides:         jakarta-%{shortname} = %{version}-%{release}
+Obsoletes:        jakarta-%{shortname} < 1.0-2
 
 %description
 The code in this component came from Avalon's Excalibur, but originally
@@ -35,61 +47,82 @@ Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
 Requires:       jpackage-utils
 
 # Upstream name change
-Provides:         jakarta-%{short_name}-javadoc = %{version}-%{release}
-Obsoletes:        jakarta-%{short_name}-javadoc < 1.0-2
+Provides:         jakarta-%{shortname}-javadoc = %{version}-%{release}
+Obsoletes:        jakarta-%{shortname}-javadoc < 1.0-2
 
 %description javadoc
-This package contains the API documentation for %{name}.
+Development documentation for %{name}.
+
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n %{shortname}-%{version}-src
+
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
+
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+rm -rf $RPM_BUILD_ROOT
 
-# poms
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+# jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+install -m644 target/%{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar
+ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}.jar
+ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# pomfile
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{shortname}.pom
+%add_to_maven_depmap org.apache.commons %{shortname} %{version} JPP %{shortname}
+
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 %update_maven_depmap
 
+
 %postun
 %update_maven_depmap
 
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{shortname}.jar
+%{_javadir}/%{shortname}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{shortname}.pom
+
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
+
 
 %changelog
-* Sat Apr 16 2011 Chris Spike <spike at fedoraproject.org> 1.1-1
-- Updated to 1.1
-- Adapted to current java packaging guidelines
+* Wed Oct 06 2010 Sandro Mathys <red at fedoraproject.org> - 1.2-1
+- New upstream version
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Oct 06 2010 Sandro Mathys <red at fedoraproject.org> - 1.1-1
+- New upstream version
 
 * Sun Jul 11 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-8
 - Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons
@@ -112,3 +145,4 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 * Tue May 04 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-2
 - Renamed from jakarta-commons-compress
+
diff --git a/sources b/sources
index 5b749e0..ede1c5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-735815362c7a459108e0e162ba9f3842  commons-compress-1.1-src.tar.gz
+a5120dae12019ec0acceab50d7aae835  commons-compress-1.2-src.tar.gz
