From 1a4f1e0aba593733c5f30f8b6477fe87a6f2fcbd Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Dec 07 2011 16:38:13 +0000 Subject: Update to latest upstream. --- diff --git a/.gitignore b/.gitignore index 8428af2..b27d780 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /commons-parent-15.tar.xz /commons-parent-20.tar.xz +commons-parent-22.tar.xz diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec index 521e990..678c414 100644 --- a/apache-commons-parent.spec +++ b/apache-commons-parent.spec @@ -2,20 +2,19 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 20 +Version: 22 Release: 1%{?dist} Summary: Apache Commons Parent Pom Group: Development/Libraries License: ASL 2.0 URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_name}-%{version}/ -# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-20 -# tar caf commons-parent-20.tar.xz commons-parent-20 +# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-22 +# tar caf commons-parent-22.tar.xz commons-parent-22 Source0: %{short_name}-%{version}.tar.xz #common-build-plugin not in fedora yet Patch1: %{name}-remove-build-plugin.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 @@ -33,8 +32,6 @@ Requires: maven-javadoc-plugin Requires: maven-plugin-bundle Requires: maven-resources-plugin Requires: maven-surefire-plugin -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description @@ -48,30 +45,21 @@ The Project Object Model files for the apache-commons packages. #nothing to do for the pom %install -rm -rf %{buildroot} - -%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} - # poms install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom -%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%clean -rm -rf %{buildroot} +%add_maven_depmap JPP-%{short_name}.pom %files -%defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt %{_mavenpomdir}/* %{_mavendepmapfragdir}/* %changelog +* Wed Dec 7 2011 Alexander Kurtakov 22-1 +- Update to latest upstream. + * Fri Apr 15 2011 Chris Spike 20-1 - Updated to 20 - Fixed Rs for maven 3 diff --git a/sources b/sources index 4f86134..3cf67fc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a9db3e7746d9fe624379d9d55eb56052 commons-parent-15.tar.xz -c9da81a4ff73aedabb3afc8f7825afb8 commons-parent-20.tar.xz +ec3a1d6a3986e9a352a24ea41c7ba7ea commons-parent-22.tar.xz