From c34fc26274a9f19e79eb46e7b00863ee0ad7c8e3 Mon Sep 17 00:00:00 2001 From: spike Date: Fri, 19 Oct 2012 23:03:02 +0200 Subject: [PATCH] Updated to 26 --- .gitignore | 1 + ...e-commons-parent-remove-build-plugin.patch | 19 +++++++++++-------- apache-commons-parent.spec | 11 +++++++---- sources | 2 +- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index b27d780..07ef58b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /commons-parent-15.tar.xz /commons-parent-20.tar.xz commons-parent-22.tar.xz +/commons-parent-26.tar.xz diff --git a/apache-commons-parent-remove-build-plugin.patch b/apache-commons-parent-remove-build-plugin.patch index a0667dd..18b2350 100644 --- a/apache-commons-parent-remove-build-plugin.patch +++ b/apache-commons-parent-remove-build-plugin.patch @@ -1,20 +1,21 @@ ---- pom.xml.orig 2011-04-15 03:47:04.754033753 +0200 -+++ pom.xml 2011-04-15 03:48:50.270963406 +0200 -@@ -242,8 +241,0 @@ +--- pom.xml 2012-10-19 23:01:18.419198466 +0200 ++++ pom.xml 2012-10-19 23:01:52.119423986 +0200 +@@ -332,8 +331,0 @@ - org.apache.commons - commons-build-plugin -- 1.3 +- 1.4 - - ${commons.release.name} - - - -@@ -353,4 +344,0 @@ -- +@@ -429,4 +420,0 @@ - org.apache.commons - commons-build-plugin - -@@ -812,8 +799,0 @@ +- +@@ -1144,11 +1131,0 @@ +- - - ${project.artifactId}-${commons.release.version} - @@ -22,4 +23,6 @@ - ${project.artifactId}-${commons.release.2.version} - - -bin -- +- ${project.artifactId}-${commons.release.3.version} +- +- -bin diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec index dad824b..38dff9e 100644 --- a/apache-commons-parent.spec +++ b/apache-commons-parent.spec @@ -2,15 +2,15 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 22 -Release: 4%{?dist} +Version: 26 +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-22 -# tar caf commons-parent-22.tar.xz commons-parent-22 +# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-26 +# tar caf commons-parent-26.tar.xz commons-parent-26 Source0: %{short_name}-%{version}.tar.xz #common-build-plugin not in fedora yet @@ -60,6 +60,9 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom %{_mavendepmapfragdir}/* %changelog +* Fri Oct 19 2012 Chris Spike 22-4 +- Updated to 26 + * Wed Jul 18 2012 Fedora Release Engineering - 22-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 3cf67fc..888ccb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec3a1d6a3986e9a352a24ea41c7ba7ea commons-parent-22.tar.xz +48c552346d5783801264ae2508dd60e7 commons-parent-26.tar.xz