commit e173b256d21674a25d515b2dfce17c3638edbb10
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 15 09:04:33 2011 +0100
Change ant dep groupId to org.apache.ant to fix build (#675389)
Versionless jar & javadocs
Use maven 3 to build
0001-Change-ant-groupId-to-org.apache.ant.patch | 34 +++++++++++++++
...-test-deps.patch => 0002-Remove-test-deps.patch | 14 ++++++-
apache-commons-configuration.spec | 45 +++++++++-----------
3 files changed, 67 insertions(+), 26 deletions(-)
---
diff --git a/0001-Change-ant-groupId-to-org.apache.ant.patch
b/0001-Change-ant-groupId-to-org.apache.ant.patch
new file mode 100644
index 0000000..f9ae838
--- /dev/null
+++ b/0001-Change-ant-groupId-to-org.apache.ant.patch
@@ -0,0 +1,34 @@
+From e2ab4b597ea7d2550fc8f66520ebf8819e5a3b52 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:48:33 +0100
+Subject: [PATCH 1/2] Change ant groupId to org.apache.ant
+
+---
+ pom.xml | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 14aa243..36060d4 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,7 +260,7 @@
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ </exclusion>
+ </exclusions>
+@@ -297,7 +297,7 @@
+ </dependency>
+
+ <dependency>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+--
+1.7.4
+
diff --git a/commons-configuration-test-deps.patch b/0002-Remove-test-deps.patch
similarity index 76%
rename from commons-configuration-test-deps.patch
rename to 0002-Remove-test-deps.patch
index 5a14bec..a321376 100644
--- a/commons-configuration-test-deps.patch
+++ b/0002-Remove-test-deps.patch
@@ -1,5 +1,14 @@
+From 205dae871426e8f4ff529d8aca66f1eee0879754 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:50:15 +0100
+Subject: [PATCH 2/2] Remove test deps
+
+---
+ pom.xml | 34 ----------------------------------
+ 1 files changed, 0 insertions(+), 34 deletions(-)
+
diff --git a/pom.xml b/pom.xml
-index 14aa243..50396e2 100644
+index 36060d4..6c372fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,13 +327,6 @@
@@ -50,3 +59,6 @@ index 14aa243..50396e2 100644
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
+--
+1.7.4
+
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index c70fa7a..716ed47 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,16 +4,15 @@
Name: apache-%{short_name}
Version: 1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
License: ASL 2.0
URL:
http://commons.apache.org/%{base_name}/
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-# TODO: make upstream fix ant:ant groupId
-Source1: %{name}-depmap.xml
-Patch0: %{short_name}-test-deps.patch
+Patch0: 0001-Change-ant-groupId-to-org.apache.ant.patch
+Patch1: 0002-Remove-test-deps.patch
BuildArch: noarch
BuildRequires: java-devel
@@ -30,6 +29,7 @@ BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
+BuildRequires: maven
BuildRequires: xalan-j2
BuildRequires: xerces-j2
@@ -96,35 +96,24 @@ Obsoletes: jakarta-%{short_name}-javadoc <
0:%{version}-%{release}
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
+%patch1 -p1
%{__sed} -i 's/\r//' LICENSE.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+# we skip tests because we don't have test deps
+mvn-rpmbuild -Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 target/%{short_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; 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
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Install pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -135,8 +124,10 @@ install -pm 644 pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -154,11 +145,15 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Feb 15 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6-5
+- Change ant dep groupId to org.apache.ant to fix build
+- Versionless jar & javadocs
+- Use maven 3 to build
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.6-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild