commit e735dc366d6a7c9de68f89f62bca726d296afccd
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Mon Nov 7 13:16:38 2011 +0200
Update to 0.5.
Build with maven and adapt to current guidelines.
.gitignore | 1 +
apache-commons-discovery.spec | 46 +++++++++++-----------------------------
sources | 2 +-
3 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 378e22f..795cbcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-discovery-0.4-src.tar.gz
+commons-discovery-0.5-src.tar.gz
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index 688be77..6b56f7a 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -1,10 +1,9 @@
-
%global base_name discovery
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 0.4
-Release: 6%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Epoch: 2
Summary: Apache Commons Discovery
License: ASL 2.0
@@ -15,14 +14,11 @@ Patch0: %{name}-addosgimanifest.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: maven
+BuildRequires: maven-surefire-provider-junit4
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}
Obsoletes: jakarta-%{short_name} <= 1:0.4
@@ -50,46 +46,31 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:0.4
%patch0
%build
-ant \
- -Djunit.jar=%(find-jar junit) \
- -Dlogger.jar=%(find-jar commons-logging) \
- test.discovery dist
+mvn-rpmbuild install javadoc:aggregate
%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
-
-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
-popd # come back from javadir
+install -p -m 644 target/%{short_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# 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}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Mon Nov 7 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2:0.5-1
+- Update to 0.5 upstream release.
+- Build with maven.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2:0.4-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -109,4 +90,3 @@ rm -rf $RPM_BUILD_ROOT
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.4-1
- Rename and cleanup of jakarta-commons-discovery
-
diff --git a/sources b/sources
index c452e46..1e6df81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1275ad4c6ce54b9323269e30dc42dd0e commons-discovery-0.4-src.tar.gz
+9222c64ae780df6301de7152b4e55874 commons-discovery-0.5-src.tar.gz