commit 1c88eaf43523851b2514ca85b9f1e21862198b34 Author: Alexander Kurtakov < akurtako@redhat.com Date: Tue Nov 1 10:30:47 2011 +0200
Update to new upstream release.
.gitignore | 1 + maven-shade-plugin.spec | 26 +++++++++++--------------- sources | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) --- diff --git a/.gitignore b/.gitignore index 2962b2a..5e213d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ maven-shade-plugin-1.3.3.tar.xz /maven-shade-plugin-1.4.tar.xz /maven-shade-plugin-1.4-source-release.zip +maven-shade-plugin-1.5-source-release.zip diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index 4b07ad2..9460064 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,6 +1,6 @@ Name: maven-shade-plugin -Version: 1.4 -Release: 4%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries @@ -33,8 +33,6 @@ Requires: maven Requires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jdependency >= 0.6 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-shade <= 0:2.0.8 Provides: maven2-plugin-shade = 1:%{version}-%{release} @@ -54,14 +52,12 @@ Requires: jpackage-utils %{summary}.
%prep -%setup -q #You may need to update this according to your Source0 +%setup -q rm src/test/jars/plexus-utils-1.4.1.jar ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%build -mvn-rpmbuild \ - -Dmaven.test.failure.ignore=true \ - install javadoc:javadoc +mvn-rpmbuild install javadoc:javadoc
%install # jars @@ -70,27 +66,27 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name} # poms install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name} +%add_to_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %{_javadir}/* %{_mavenpomdir}/* %{_mavendepmapfragdir}/* +%doc LICENSE NOTICE +
%files javadoc %{_javadocdir}/%{name} +%doc LICENSE
%changelog +* Tue Nov 1 2011 Alexander Kurtakov akurtako@redhat.com 1.5-1 +- Update to upstream 1.5 release. + * Thu Jun 9 2011 Alexander Kurtakov akurtako@redhat.com 1.4-4 - Build with maven 3.x. - Use upstream source. diff --git a/sources b/sources index 13ef007..2356972 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f9a2f31806f882d159383121d5f4030 maven-shade-plugin-1.4-source-release.zip +4cb42d96fede5f9cf97902c87fd03dd4 maven-shade-plugin-1.5-source-release.zip
java-sig-commits@lists.fedoraproject.org