Updated to 20

Fixed Rs for maven 3
This commit is contained in:
spike 2011-04-15 04:08:32 +02:00
parent 87c45b27dc
commit db0a21ef30
4 changed files with 17 additions and 33 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/commons-parent-15.tar.xz /commons-parent-15.tar.xz
/commons-parent-20.tar.xz

View File

@ -1,9 +1,6 @@
--- pom.xml 2010-04-20 03:00:29.000000000 +0200 --- pom.xml.orig 2011-04-15 03:47:04.754033753 +0200
+++ pom.xml 2010-11-06 15:59:59.509445003 +0100 +++ pom.xml 2011-04-15 03:48:50.270963406 +0200
@@ -251,14 +251,6 @@ @@ -242,8 +241,0 @@
</plugin>
<!-- Other plugins, alpha order by groupId and artifactId -->
<plugin>
- <groupId>org.apache.commons</groupId> - <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId> - <artifactId>commons-build-plugin</artifactId>
- <version>1.3</version> - <version>1.3</version>
@ -12,24 +9,12 @@
- </configuration> - </configuration>
- </plugin> - </plugin>
- <plugin> - <plugin>
<groupId>org.apache.felix</groupId> @@ -353,4 +344,0 @@
<artifactId>maven-bundle-plugin</artifactId>
<!-- version 1.4.x is required for JDK 1.4 compatibilty -->
@@ -363,10 +355,6 @@
</execution>
</executions>
</plugin>
- <plugin> - <plugin>
- <groupId>org.apache.commons</groupId> - <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId> - <artifactId>commons-build-plugin</artifactId>
- </plugin> - </plugin>
</plugins> @@ -812,8 +799,0 @@
</build>
@@ -740,14 +728,6 @@
<commons.surefire.java />
<commons.surefire.version>2.5</commons.surefire.version>
- <!-- Default values for the download-page generation by commons-build-plugin --> - <!-- Default values for the download-page generation by commons-build-plugin -->
- <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name> - <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
- <commons.release.desc /> - <commons.release.desc />
@ -38,6 +23,3 @@
- <commons.release.2.desc /> - <commons.release.2.desc />
- <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix> - <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix>
- -
<!-- Commons Component Id -->
<commons.componentid>${project.artifactId}</commons.componentid>

View File

@ -2,15 +2,15 @@
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 15 Version: 20
Release: 3%{?dist} Release: 1%{?dist}
Summary: Apache Commons Parent Pom Summary: Apache Commons Parent Pom
Group: Development/Libraries Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_name}-%{version}/ 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-15 # svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-20
# tar caf commons-parent-15.tar.xz commons-parent-15 # tar caf commons-parent-20.tar.xz commons-parent-20
Source0: %{short_name}-%{version}.tar.xz Source0: %{short_name}-%{version}.tar.xz
#common-build-plugin not in fedora yet #common-build-plugin not in fedora yet
@ -23,9 +23,8 @@ BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0 Requires: java >= 1:1.6.0
Requires: jpackage-utils Requires: jpackage-utils
Requires: maven2 >= 2.2.1 Requires: maven
Requires: maven-antrun-plugin Requires: maven-antrun-plugin
Requires: maven-assembly-plugin
Requires: maven-compiler-plugin Requires: maven-compiler-plugin
Requires: maven-idea-plugin Requires: maven-idea-plugin
Requires: maven-install-plugin Requires: maven-install-plugin
@ -73,11 +72,12 @@ rm -rf %{buildroot}
%{_mavendepmapfragdir}/* %{_mavendepmapfragdir}/*
%changelog %changelog
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 15-3 * Fri Apr 15 2011 Chris Spike <spike@fedoraproject.org> 20-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Updated to 20
- Fixed Rs for maven 3
* Sat Nov 6 2010 Chris Spike <chris.spike@arcor.de> 15-2 * Sat Nov 6 2010 Chris Spike <spike@fedoraproject.org> 15-2
- Added patch to remove commons-build-plugin from pom file - Added patch to remove commons-build-plugin from pom file
* Wed Oct 20 2010 Chris Spike <chris.spike@arcor.de> 15-1 * Wed Oct 20 2010 Chris Spike <spike@fedoraproject.org> 15-1
- Initial version of the package - Initial version of the package

View File

@ -1 +1,2 @@
a9db3e7746d9fe624379d9d55eb56052 commons-parent-15.tar.xz a9db3e7746d9fe624379d9d55eb56052 commons-parent-15.tar.xz
c9da81a4ff73aedabb3afc8f7825afb8 commons-parent-20.tar.xz