[felix-gogo-command] Start using mvn_build/install.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri May 16 13:59:57 UTC 2014
commit d7126d62d26afa08afb7e97683f57a1fed389486
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri May 16 16:59:47 2014 +0300
Start using mvn_build/install.
felix-gogo-command.spec | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/felix-gogo-command.spec b/felix-gogo-command.spec
index 1feb373..1e6854d 100644
--- a/felix-gogo-command.spec
+++ b/felix-gogo-command.spec
@@ -8,7 +8,7 @@
Name: %{?scl_prefix}%{project}-gogo-command
Version: 0.12.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Apache Felix Gogo Command
Group: Development/Libraries
@@ -27,7 +27,7 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: maven-local
BuildRequires: maven-dependency-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildRequires: jpackage-utils
BuildRequires: maven-install-plugin
BuildRequires: mockito
@@ -65,35 +65,21 @@ API documentation for %{pkg_name}.
%patch1 -p1
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{project}
-install -m 644 target/%{bundle}-%{version}.jar \
- %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
+%mvn_install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-
-%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{pkg_name}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{pkg_name}
-
-%files
+%files -f .mfiles
%doc LICENSE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
-%{_javadocdir}/%{pkg_name}
%changelog
+* Fri May 16 2014 Alexander Kurtakov <akurtako at redhat.com> 0.12.0-10
+- Start using mvn_build/install.
+
* Mon Aug 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.12.0-9
- Fix FTBS.
More information about the scm-commits
mailing list