[httpunit/f17: 2/2] Added POM + Requires on jpackage-utils in subpackage

Tomas Radej tradej at fedoraproject.org
Tue Aug 21 14:52:50 UTC 2012


commit 17e2ce2f4a357c906ccdfa3acdd42ac8cc720029
Author: Tomas Radej <tradej at redhat.com>
Date:   Tue Aug 21 16:04:45 2012 +0200

    Added POM + Requires on jpackage-utils in subpackage

 httpunit.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/httpunit.spec b/httpunit.spec
index 3161964..b65484c 100644
--- a/httpunit.spec
+++ b/httpunit.spec
@@ -30,11 +30,12 @@
 
 Name:           httpunit
 Version:        1.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 Summary:        Automated web site testing toolkit
 License:        MIT
 Source0:        http://download.sourceforge.net/httpunit/httpunit-%{version}.zip
+Source1:        http://repo1.maven.org/maven2/httpunit/httpunit/1.7/httpunit-1.7.pom
 Patch1:         %{name}-JavaScript-NotAFunctionException.patch
 Patch2:         %{name}-servlettest.patch
 Patch3:         %{name}-not-implemented.patch
@@ -70,6 +71,7 @@ A companion framework, ServletUnit is included in the package.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}
@@ -110,6 +112,8 @@ ln -s \
   %{_javadir}/xerces-j2.jar \
   jars
 
+mv %{SOURCE1} pom.xml
+
 
 %build
 export CLASSPATH=$(build-classpath javamail)
@@ -125,6 +129,12 @@ cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+# POM
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+
 # Avoid having api in doc
 rm -rf doc/api
 
@@ -135,6 +145,8 @@ popd
 
 %files
 %{_javadir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %{_javadocdir}/%{name}
@@ -143,6 +155,10 @@ popd
 %doc doc/*
 
 %changelog
+* Tue Aug 21 2012 Tomas Radej <tradej at redhat.com> - 0:1.7-9
+- Added POM File
+- Added Requires on jpackage-utils to javadoc package
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list