diff --git a/.gitignore b/.gitignore index 61e8cd9..d251be2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /plexus-pom-3.0.1.tar.xz +/plexus-pom-3.3.1.tar.xz diff --git a/plexus-pom.spec b/plexus-pom.spec index a7fc8ab..9218987 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,30 +1,20 @@ Name: plexus-pom -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Root Plexus Projects pom Group: Development/Libraries License: ASL 2.0 URL: https://github.com/sonatype/%{name}/ # git clone git://github.com/sonatype/plexus-pom.git -# cd plexus-pom -# git archive --format=tar --prefix=plexus-pom-3.0.1/ plexus-3.0.1 | xz >plexus-pom-3.0.1.tar.xz -Source0: plexus-pom-%{version}.tar.xz +# (cd plexus-pom && git archive --format=tar --prefix=plexus-pom-3.3.1/ plexus-3.3.1 | xz > ../plexus-pom-3.3.1.tar.xz) +Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -# remove -# org.codehaus.mojo taglist-maven-plugin 2.4 -# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 -Patch0: plexus-pom-3.0.1-pom.patch -# remove -# maven-site-plugin which require org.codehaus.plexus:plexus-stylus-skin 1.0 -Patch1: plexus-pom-3.0.1-no-site-plugin.patch - BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: spice-parent BuildRequires: maven -BuildRequires: maven-install-plugin BuildRequires: modello BuildRequires: plexus-containers-component-metadata @@ -40,26 +30,36 @@ executing software projects. %prep %setup -q -%patch0 -p0 -%patch1 -p0 +# require: maven-site-plugin * +%pom_xpath_remove "pom:profile[pom:id='maven-3']" +# * require: org.codehaus.plexus plexus-stylus-skin 1.0 +# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 +%pom_remove_plugin org.apache.maven.plugins:maven-site-plugin + +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin +%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin cp -p %{SOURCE1} LICENSE %build - -mvn-rpmbuild install - +# Nothing to do %install mkdir -p %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-plexus.pom %add_maven_depmap JPP.plexus-plexus.pom +%check +mvn-rpmbuild verify + %files %doc LICENSE %{_mavenpomdir}/JPP.plexus-plexus.pom %{_mavendepmapfragdir}/%{name} %changelog +* Sat Dec 08 2012 gil cattaneo 3.3.1-1 +- Update to 3.3.1 + * Wed Nov 21 2012 Mikolaj Izdebski - 3.0.1-3 - Install LICENSE file - Resolves: rhbz#878825 diff --git a/sources b/sources index 4eb9ecc..319ef64 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -75753f24254b405a3a5c0d20e57e56c8 plexus-pom-3.0.1.tar.xz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +59804aa5ed1b84dca53a087a8621450c plexus-pom-3.3.1.tar.xz