diff --git a/.gitignore b/.gitignore index 3b133d6..fad4c39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /fasterxml-oss-parent-3-src-git.tar.xz /fasterxml-oss-parent-4-src-git.tar.xz +/oss-parent-10.tar.gz diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index 5863a9d..a57def3 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,28 +1,28 @@ +%global oname oss-parent Name: fasterxml-oss-parent -Version: 4 -Release: 3%{?dist} +Version: 10 +Release: 1%{?dist} Summary: FasterXML parent pom Group: Development/Libraries -License: ASL 2.0 +# pom file licenses ASL 2.0 and LGPL 2.1 +License: ASL 2.0 and LGPLv2+ URL: http://fasterxml.com/ # git clone git://github.com/FasterXML/oss-parent.git fasterxml-oss-parent-4 # (cd fasterxml-oss-parent-4/ && git archive --format=tar --prefix=fasterxml-oss-parent-4/ oss-parent-4 | xz > ../fasterxml-oss-parent-4-src-git.tar.xz) -Source0: %{name}-%{version}-src-git.tar.xz - -# remove unavailable extension org.kathrynhuxtable.maven.wagon wagon-gitsite 0.3.1 -# fix javadoc configration, remove unavailable com.google.doclava doclava 1.0.3 -Patch0: fasterxml-oss-parent-3-pom.patch +Source0: https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz BuildRequires: java-devel -BuildRequires: jpackage-utils BuildRequires: maven-local BuildRequires: maven-enforcer-plugin +BuildRequires: maven-plugin-build-helper BuildRequires: maven-plugin-bundle BuildRequires: maven-site-plugin +BuildRequires: replacer + +Requires: replacer Requires: java -Requires: jpackage-utils BuildArch: noarch %description @@ -36,12 +36,20 @@ and extension. This package contains the parent pom file for FasterXML.com projects. %prep -%setup -q -n %{name}-%{version} -%patch0 -p0 +%setup -q -n %{oname}-%{oname}-%{version} %pom_remove_plugin org.sonatype.plugins:nexus-maven-plugin %pom_remove_plugin org.codehaus.mojo:jdepend-maven-plugin %pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin +# remove unavailable com.google.doclava doclava 1.0.3 +%pom_xpath_remove "pom:build/pom:extensions/pom:extension[pom:artifactId='wagon-gitsite']" +%pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" +%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" ' + + UTF-8 + true + ${javac.src.version} +' %build # nothing to do @@ -60,6 +68,9 @@ mvn-rpmbuild verify %doc LICENSE NOTICE README.creole %changelog +* Tue May 07 2013 gil cattaneo 10-1 +- update to 10 + * Wed Feb 13 2013 Fedora Release Engineering - 4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 3ff82d6..12de695 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cc4e7908e80fe0c4c3c6934927cdd54 fasterxml-oss-parent-4-src-git.tar.xz +07ea1c3eb9f761c580b2b9c2f9ed33f1 oss-parent-10.tar.gz