[dumbster] Install LICENSE file with javadoc package
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Sep 4 11:29:51 UTC 2012
commit 498dfe66350a9727fe7e39f2e0272c3190d31321
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Sep 4 13:19:08 2012 +0200
Install LICENSE file with javadoc package
- Update to current packaging guidelines
- Add missing R: java, jpackage-utils
- Don't own _mavendepmapfragdir, resolves #850009
dumbster.spec | 51 +++++++++++++++++++++------------------------------
1 files changed, 21 insertions(+), 30 deletions(-)
---
diff --git a/dumbster.spec b/dumbster.spec
index 37cecd2..45ed5a3 100644
--- a/dumbster.spec
+++ b/dumbster.spec
@@ -31,7 +31,7 @@
Summary: Fake SMTP Server
Name: dumbster
Version: 1.6
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://quintanasoft.com/dumbster/
@@ -45,6 +45,8 @@ BuildRequires: ant >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: javamail
BuildRequires: junit
+Requires: java
+Requires: jpackage-utils
Requires: java-sasl
Requires: javamail
@@ -60,6 +62,7 @@ Dumbster for later extraction and verification.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
%{summary}.
@@ -82,45 +85,33 @@ popd
ant jar javadoc
%install
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 build/%{name}.jar %{buildroot}%{_javadir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
-install -m 0644 build/%{name}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# pom
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -pr %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap dumbster %{name} 1.6 JPP %{name}
-
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/maven2
-ln -s %{_datadir}/maven2/poms $RPM_BUILD_ROOT%{_javadir}/maven2/poms
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}/
%files
-%defattr(-,root,root,-)
%doc license.txt
-%{_javadir}/*.jar
-%{_datadir}/maven2/poms
-%{_javadir}/maven2
-%{_mavendepmapfragdir}
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
+%doc license.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.6-13
+- Install LICENSE file with javadoc package
+- Update to current packaging guidelines
+- Add missing R: java, jpackage-utils
+- Don't own _mavendepmapfragdir, resolves #850009
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list