[apache-commons-configuration] Update to upstream version 1.9
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Thu Aug 23 05:14:41 UTC 2012
commit cabfb470807e9f58b2eb26ac70d9a5c18c596b4e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Aug 23 07:12:33 2012 +0200
Update to upstream version 1.9
- Update to currennt packaging guidelines
apache-commons-configuration.spec | 40 +++++++++++++++++-------------------
sources | 2 +-
2 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index 2768f16..a121b2a 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -3,8 +3,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.8
-Release: 2%{?dist}
+Version: 1.9
+Release: 1%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
@@ -91,33 +91,27 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%build
# We skip tests because we don't have test deps (dbunit in particular).
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-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
+install -d -m 755 %{buildroot}%{_javadir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+install -p -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a org.apache.commons:%{short_name}
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-# Install pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
%files
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
%doc LICENSE.txt NOTICE.txt
@@ -125,6 +119,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
%changelog
+* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.9-1
+- Update to upstream version 1.9
+- Update to currennt packaging guidelines
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 97baa5e..1fc1c99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d875d81f386cac91ff1790cf08f9e1c5 commons-configuration-1.8-src.tar.gz
+ae307b9a5448761174c0ab8879e9e129 commons-configuration-1.9-src.tar.gz
More information about the scm-commits
mailing list