From 555b5b579a908362e74333498a2d2d92c228f8ad Mon Sep 17 00:00:00 2001 From: gil Date: Mar 01 2015 11:22:21 +0000 Subject: use new javapackage macros to provide maven metadata --- diff --git a/BareBonesBrowserLaunch.spec b/BareBonesBrowserLaunch.spec index 9f09a91..0e88a78 100644 --- a/BareBonesBrowserLaunch.spec +++ b/BareBonesBrowserLaunch.spec @@ -1,16 +1,13 @@ Name: BareBonesBrowserLaunch Version: 3.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Simple library to launch a browser window from Java License: Public Domain URL: http://www.centerkey.com/java/browser/ Source0: http://www.centerkey.com/java/browser/myapp/real/bare-bones-browser-launch-%{version}.jar BuildRequires: java-devel -BuildRequires: jpackage-utils - -Requires: java -Requires: jpackage-utils +BuildRequires: javapackages-local BuildArch: noarch @@ -33,26 +30,22 @@ rm -rf doc/* %build %{javac} com/centerkey/utils/BareBonesBrowserLaunch.java -%{jar} -cf %{name}.jar com +%{jar} -cf %{name}.jar com/centerkey/utils/BareBonesBrowserLaunch.class %{javadoc} -encoding UTF-8 -d doc com/centerkey/utils/BareBonesBrowserLaunch.java -windowtitle "%{name} %{version}" %install - -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -# used by jets3t -%add_maven_depmap com.centerkey.utils:%{name}:%{version} %{name}.jar - -#javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pR doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_artifact com.centerkey.utils:%{name}:%{version} %{name}.jar +%mvn_file com.centerkey.utils:%{name} %{name} +%mvn_install -J doc %files -f .mfiles -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Sun Mar 01 2015 gil cattaneo 3.1-10 +- use new javapackage macros + * Sun Feb 15 2015 gil cattaneo 3.1-9 - Add maven metadata - Adapt to current guideline