commit c6b10a3da55814094244ba8babd022e3df7dfb25
Author: Mat Booth <fedora(a)matbooth.co.uk>
Date: Mon Feb 11 22:39:40 2013 +0000
Get jcommander building without xmvn so we can issue an F18 update
beust-jcommander.spec | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 5859839..1f989b3 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -2,15 +2,22 @@
Name: beust-%{short_name}
Version: 1.30
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Java framework for parsing command line parameters
License: ASL 2.0
Group: Development/Libraries
URL:
http://jcommander.org/
Source0:
https://github.com/cbeust/%{short_name}/archive/%{short_name}-%{version}....
+
BuildArch: noarch
-BuildRequires: maven-local
-BuildRequires: beust-jcommander
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: maven-local
+BuildRequires: testng
+
+Requires: java
+Requires: jpackage-utils
%description
JCommander is a very small Java framework that makes it trivial to
@@ -19,28 +26,47 @@ parse command line parameters (with annotations).
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
-This package contains the %{summary}.
+This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{short_name}-%{version}
chmod -x license.txt
%build
-%mvn_file : %{name}
-%mvn_build -f
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+#mvn-rpmbuild install javadoc:aggregate
%install
-%mvn_install
+# jars
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-%files -f .mfiles
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
%doc license.txt notice.md README.markdown
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
-%files javadoc -f .mfiles-javadoc
+%files javadoc
%doc license.txt notice.md
+%{_javadocdir}/%{name}
%changelog
+* Mon Feb 11 2013 Mat Booth <fedora(a)matbooth.co.uk> - 1.30-2.1
+- Remove experimental maven macros to allow building on F18
+
* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.30-2
- Replace BR: xmvn with maven-local