From ba100adb49eaf97df4cdf78141513f21447b1dcc Mon Sep 17 00:00:00 2001 From: gil Date: Jul 06 2013 18:54:23 +0000 Subject: switch to XMvn --- diff --git a/concurrentlinkedhashmap-lru.spec b/concurrentlinkedhashmap-lru.spec index 1bf7f03..a08effc 100644 --- a/concurrentlinkedhashmap-lru.spec +++ b/concurrentlinkedhashmap-lru.spec @@ -1,6 +1,6 @@ Name: concurrentlinkedhashmap-lru Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A ConcurrentLinkedHashMap for Java Group: Development/Libraries License: ASL 2.0 @@ -44,7 +44,6 @@ BuildRequires: maven-site-plugin #BuildRequires: animal-sniffer #BuildRequires: mojo-signatures -Requires: java BuildArch: noarch %description @@ -52,7 +51,6 @@ A high performance version of java.util.LinkedHashMap for use as a software cache. %package javadoc -Group: Documentation Summary: Javadoc for %{name} %description javadoc @@ -88,31 +86,23 @@ sed -i "s|jdk.version}-sun|jdk.version}|" pom.xml %build +%mvn_file :%{name} %{name} # test skipped for unavailable test deps -mvn-rpmbuild -Dmaven.test.skip=true package javadoc:aggregate +%mvn_build -f %install +%mvn_install -mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc README -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Sat Jul 06 2013 gil cattaneo 1.3.2-2 +- switch to XMvn +- minor changes to adapt to current guideline + * Thu May 23 2013 gil cattaneo 1.3.2-1 - update to 1.3.2