From 3e5dd0569eadc2ddb391afb1701f25b9fcd6770b Mon Sep 17 00:00:00 2001 From: spike Date: Apr 16 2011 07:54:39 +0000 Subject: Updated to 1.1 Adapted to current java packaging guidelines --- diff --git a/.gitignore b/.gitignore index e6dcf86..b6c1ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ commons-compress-1.0-src.tar.gz +/commons-compress-1.1-src.tar.gz diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 72753d3..47885a1 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,32 +1,19 @@ -%global shortname commons-compress +%global base_name compress +%global short_name commons-%{base_name} -Name: apache-%{shortname} -Version: 1.0 -Release: 9%{?dist} +Name: apache-%{short_name} +Version: 1.1 +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/compress/ -Source0: http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz +URL: http://commons.apache.org/%{base_name}/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{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: 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 +BuildRequires: apache-commons-parent Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires(post): jpackage-utils @@ -34,8 +21,8 @@ Requires(postun): jpackage-utils # Upstream name change -Provides: jakarta-%{shortname} = %{version}-%{release} -Obsoletes: jakarta-%{shortname} < 1.0-2 +Provides: jakarta-%{short_name} = %{version}-%{release} +Obsoletes: jakarta-%{short_name} < 1.0-2 %description The code in this component came from Avalon's Excalibur, but originally @@ -48,77 +35,59 @@ 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-%{shortname}-javadoc = %{version}-%{release} -Obsoletes: jakarta-%{shortname}-javadoc < 1.0-2 +Provides: jakarta-%{short_name}-javadoc = %{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < 1.0-2 %description javadoc -Development documentation for %{name}. - +This package contains the API documentation for %{name}. %prep -%setup -q -n %{shortname}-%{version}-src - +%setup -q -n %{short_name}-%{version}-src %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL -mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc - +mvn-rpmbuild install javadoc:aggregate %install -rm -rf $RPM_BUILD_ROOT +# 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 -# 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 +# 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} # javadoc -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 - +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %post %update_maven_depmap - %postun %update_maven_depmap - %files %defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt -%{_javadir}/%{shortname}.jar -%{_javadir}/%{shortname}-%{version}.jar -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP-%{shortname}.pom - +%{_javadir}/* +%{_mavenpomdir}/JPP-%{short_name}.pom +%{_mavendepmapfragdir}/* %files javadoc %defattr(-,root,root,-) -%{_javadocdir}/%{name} - +%doc LICENSE.txt NOTICE.txt +%doc %{_javadocdir}/%{name} %changelog +* Sat Apr 16 2011 Chris Spike 1.1-1 +- Updated to 1.1 +- Adapted to current java packaging guidelines + * Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -143,4 +112,3 @@ rm -rf $RPM_BUILD_ROOT * Tue May 04 2010 Sandro Mathys - 1.0-2 - Renamed from jakarta-commons-compress - diff --git a/sources b/sources index 74616e3..5b749e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e5ef0d79590e06049724f159408923f commons-compress-1.0-src.tar.gz +735815362c7a459108e0e162ba9f3842 commons-compress-1.1-src.tar.gz