From 90d57f92d6012eee4cbc0d96e3f296d4e937f23f Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 6 Jul 2013 21:10:45 +0200 Subject: [PATCH] switch to XMvn --- fasterxml-oss-parent-3-pom.patch | 46 -------------------------------- fasterxml-oss-parent.spec | 27 +++++++------------ 2 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 fasterxml-oss-parent-3-pom.patch diff --git a/fasterxml-oss-parent-3-pom.patch b/fasterxml-oss-parent-3-pom.patch deleted file mode 100644 index e739a52..0000000 --- a/fasterxml-oss-parent-3-pom.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- pom.xml 2012-08-21 03:42:31.000000000 +0200 -+++ pom.xml-gil 2012-09-13 15:44:25.590144619 +0200 -@@ -346,11 +346,11 @@ - 1.7 - - -- -+ - - - -@@ -361,23 +361,16 @@ - maven-javadoc-plugin - ${javadoc.version} - -- ${sun.boot.class.path} -- com.google.doclava.Doclava -- false -- -J-Xmx1024m -+ 128m - ${javadoc.maxmemory} -+ true -+ true -+ false -+ ${javac.src.version} -+ true - - http://docs.oracle.com/javase/6/docs/api/ - -- -- com.google.doclava -- doclava -- 1.0.3 -- -- -- -hdf project.name "${project.name}" -- -d ${project.reporting.outputDirectory}/apidocs -- - - - diff --git a/fasterxml-oss-parent.spec b/fasterxml-oss-parent.spec index a57def3..d6def26 100644 --- a/fasterxml-oss-parent.spec +++ b/fasterxml-oss-parent.spec @@ -1,14 +1,11 @@ %global oname oss-parent Name: fasterxml-oss-parent Version: 10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FasterXML parent pom -Group: Development/Libraries # 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: https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz BuildRequires: java-devel @@ -20,9 +17,6 @@ BuildRequires: maven-plugin-bundle BuildRequires: maven-site-plugin BuildRequires: replacer -Requires: replacer - -Requires: java BuildArch: noarch %description @@ -52,22 +46,19 @@ This package contains the parent pom file for FasterXML.com projects. ' %build -# nothing to do +%mvn_build + %install +%mvn_install -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom - -%check -mvn-rpmbuild verify - -%files -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE NOTICE README.creole %changelog +* Sat Jul 06 2013 gil cattaneo 10-2 +- switch to XMvn +- minor changes to adapt to current guideline + * Tue May 07 2013 gil cattaneo 10-1 - update to 10