[easymock2] Install LICENSE with javadoc package
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Aug 17 08:38:23 UTC 2012
commit 2185df671934150d007739d3270d5c89542099a1
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Aug 16 19:09:33 2012 +0200
Install LICENSE with javadoc package
- Don't own _mavendepmapfragdir
- Install POM in _mavenpomdir instead of _datadir/maven2/poms
- Update to current packaging guidelines
easymock2.spec | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/easymock2.spec b/easymock2.spec
index 982646f..1921e8b 100644
--- a/easymock2.spec
+++ b/easymock2.spec
@@ -1,6 +1,6 @@
Name: easymock2
Version: 2.5.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Easy mock objects
License: ASL 2.0
Group: Development/Languages
@@ -21,7 +21,6 @@ BuildRequires: java-javadoc
BuildRequires: zip
Requires: java
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: jpackage-utils >= 0:1.7.2
%description
@@ -57,19 +56,16 @@ touch META-INF/MANIFEST.MF
zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 755 %{buildroot}%{_javadir}
-%add_to_maven_depmap org.easymock easymock %{version} JPP %{name}
install -m 644 target/%{name}-%{version}.jar \
%{buildroot}%{_javadir}/%{name}.jar
# pom
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
- %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -77,27 +73,23 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/apidocs
-%clean
-rm -rf %{buildroot}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt
-%{_javadir}/*
-%{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE.txt
%doc %{_javadocdir}/*
%changelog
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.5.2-8
+- Install LICENSE with javadoc package
+- Don't own _mavendepmapfragdir
+- Install POM in _mavenpomdir instead of _datadir/maven2/poms
+- Update to current packaging guidelines
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list