commit 3a3a912e0fcf04b30d32c8c63d7fd139754d0773 Author: Mat Booth fedora@matbooth.co.uk Date: Sun Aug 5 14:48:31 2012 +0100

- Remove old obsolete/provides. - Build with maven3. - Install versionless artifacts only. - Conform more to newer guidelines.

apache-commons-launcher.spec | 49 ++++++++++++----------------------------- 1 files changed, 15 insertions(+), 34 deletions(-) --- diff --git a/apache-commons-launcher.spec b/apache-commons-launcher.spec index 6ae9ab5..9dd734e 100644 --- a/apache-commons-launcher.spec +++ b/apache-commons-launcher.spec @@ -3,7 +3,7 @@

Name: apache-%{short_name} Version: 1.1 -Release: 9.20100521svn936225%{?dist} +Release: 10.20100521svn936225%{?dist} Summary: A cross platform Java application launcher Group: Development/Libraries License: ASL 2.0 @@ -30,8 +30,6 @@ Source0: %{short_name}-%{version}-src.tar.gz # remove unnecessary build dependency on ant-optional (ant no longer ships this jar) Patch0: %{short_name}-pom.patch

-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0 @@ -50,11 +48,6 @@ 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 - -Provides: jakarta-%{short_name} = %{version}-%{release} -Obsoletes: jakarta-%{short_name} < %{version}-%{release}

%description Commons-launcher eliminates the need for a batch or shell script to launch a @@ -85,7 +78,6 @@ batch and shell scripts. Summary: API documentation for %{name} Group: Documentation Requires: jpackage-utils -Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}

%description javadoc %{summary}. @@ -100,24 +92,18 @@ sed -i 's/\r//' README.txt LICENSE.txt NOTICE.txt sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|g" build.xml

%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 %{buildroot} - # jars -install -pD -T target/%{short_name}-%{version}.jar \ - %{buildroot}%{_javadir}/%{short_name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done) -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{short_name}-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}.jar +(cd %{buildroot}%{_javadir} && ln -sf %{name}.jar %{short_name}.jar)

# javadocs -install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}

# pom install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom @@ -127,28 +113,23 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom # should use proper groupid org.apache.commons %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}

-%clean -rm -rf %{buildroot} - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files -%defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt %{_mavendepmapfragdir}/* %{_mavenpomdir}/* %{_javadir}/*

%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} +%doc LICENSE.txt %{_javadocdir}/%{name}

%changelog +* Sun Aug 5 2012 Mat Booth fedora@matbooth.co.uk - 1.1-10.20100521svn936225 +- Remove old obsolete/provides. +- Build with maven3. +- Install versionless artifacts only. +- Conform more to newer guidelines. + * Wed Jul 18 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-9.20100521svn936225 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild