diff --git a/apache-commons-discovery-0.4-pom.patch b/apache-commons-discovery-0.4-pom.patch
new file mode 100644
index 0000000..3e64049
--- /dev/null
+++ b/apache-commons-discovery-0.4-pom.patch
@@ -0,0 +1,17 @@
+--- pom.xml 2006-12-03 07:27:17.000000000 +0100
++++ pom.xml-gil 2012-05-17 08:53:48.291516910 +0200
+@@ -129,14 +129,6 @@
+
+
+
+-
+- maven-xdoc-plugin
+- 1.9.2
+-
+- <strong>Site Only</strong> - v1.9.2 (minimum)
+- required for building the Site documentation.
+-
+-
+
+
+
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index 688be77..5cc00d1 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -4,24 +4,25 @@
Name: apache-%{short_name}
Version: 0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 2
Summary: Apache Commons Discovery
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Patch0: %{name}-addosgimanifest.patch
+# removed maven-xdoc-plugin
+Patch1: %{name}-%{version}-pom.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
-BuildRequires: ant-nodeps
BuildRequires: junit >= 0:3.7
BuildRequires: apache-commons-logging >= 1.1.1
Requires: apache-commons-logging >= 1.1.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This should go away with F-17
Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
@@ -48,6 +49,8 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:0.4
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0
+cp -p %{SOURCE1} pom.xml
+%patch1
%build
ant \
@@ -56,40 +59,45 @@ ant \
test.discovery dist
%install
-rm -rf $RPM_BUILD_ROOT
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
+ ln -s %{name}.jar %{short_name}.jar
popd # come back from javadir
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%pre javadoc
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu May 17 2012 gil cattaneo - 2:0.4-7
+- add maven pom
+- adapt to current guideline
+- add %%pre javadoc script
+- remove BR ant-nodeps
+
* Mon Feb 07 2011 Fedora Release Engineering - 2:0.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/commons-discovery-0.4.pom b/commons-discovery-0.4.pom
new file mode 100644
index 0000000..d7bfa01
--- /dev/null
+++ b/commons-discovery-0.4.pom
@@ -0,0 +1,168 @@
+
+ 4.0.0
+ commons-discovery
+ commons-discovery
+ Discovery
+ 0.4
+ Commons Discovery
+ http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
+
+ http://issues.apache.org/jira/
+
+
+
+
+
+ commons-dev@jakarta.apache.org
+
+
+
+
+ 2002
+
+
+ Commons Dev List
+ commons-dev-subscribe@jakarta.apache.org
+ commons-dev-unsubscribe@jakarta.apache.org
+ http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/
+
+
+ Commons User List
+ commons-user-subscribe@jakarta.apache.org
+ commons-user-unsubscribe@jakarta.apache.org
+ http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/
+
+
+
+
+ rsitze
+ Richard Sitze
+
+
+
+
+ craigmcc
+ Craig R. McClanahan
+
+
+
+
+ costin
+ Costin Manolache
+
+
+
+
+ jstrachan
+ James Strachan
+ jstrachan@apache.org
+ SpiritSoft, Inc.
+
+
+ matth
+ Matthew Hawthorne
+ matth@apache.org
+
+
+ dims
+ Davanum Srinivas
+ dims@apache.org
+
+
+ rwinston
+ Rory Winston
+ rwinston@eircom.net
+
+
+ rdonkin
+ Robert Burrell Donkin
+ rdonkin@apache.org
+
+
+
+
+ The Apache Software License, Version 2.0
+ /LICENSE.txt
+
+
+
+ scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
+ http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
+
+
+ The Apache Software Foundation
+ http://jakarta.apache.org
+
+
+ src/java
+ src/test
+
+
+ META-INF
+ ${basedir}
+
+ NOTICE.txt
+
+
+
+
+
+ ${basedir}/src
+
+ **/testResource
+
+
+
+ ${basedir}/src/test
+
+ **/*.properties
+ META-INF/**
+
+
+
+
+
+ maven-surefire-plugin
+
+
+ **/TestAll.java
+
+
+
+
+ maven-xdoc-plugin
+ 1.9.2
+
+ <strong>Site Only</strong> - v1.9.2 (minimum)
+ required for building the Site documentation.
+
+
+
+
+
+
+ commons-logging
+ commons-logging
+ 1.0.4
+
+
+ junit
+ junit
+ 3.7
+ test
+
+
+
+
+ default
+ Default Repository
+ file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/
+
+
+ default
+ Default Site
+ scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
+
+ converted
+
+
\ No newline at end of file