[jgoodies-common] Update for newer guidelines
Mohamed ElMorabity
melmorabity at fedoraproject.org
Fri Aug 16 13:08:02 UTC 2013
commit 67975a9195b073627920c144152b6f334cc1ac3e
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Fri Aug 16 15:07:49 2013 +0200
Update for newer guidelines
jgoodies-common.spec | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/jgoodies-common.spec b/jgoodies-common.spec
index 9f36b4e..c6b0d2f 100644
--- a/jgoodies-common.spec
+++ b/jgoodies-common.spec
@@ -2,7 +2,7 @@
Name: jgoodies-common
Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common library shared by JGoodies libraries and applications
Group: Development/Libraries
@@ -58,34 +58,28 @@ for file in LICENSE.txt RELEASE-NOTES.txt; do
mv $file.new $file
done
+%mvn_file :%{name} %{name} %{name}
+
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-install -Dpm 0644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -Dpm 0644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-cp -a target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+%mvn_install
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
%doc LICENSE.txt README.html RELEASE-NOTES.txt
-%{_javadir}/*.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%files javadoc
-%{_javadocdir}/%{name}/
+%files javadoc -f .mfiles-javadoc
%changelog
+* Fri Aug 16 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.6.0-3
+- Update for newer guidelines
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list