4:13 a.m.
commit 9232a376eecfd21f588e5b23c30c8109605ac61f
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Tue Nov 29 12:12:45 2011 +0200
Update to latest upstream release.
Adapt to current guidelines.
.gitignore | 1 +
001-mavenrelease-skiptests.patch | 42 --------------------------------------
maven-release.spec | 32 +++++++---------------------
sources | 1 +
4 files changed, 10 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe9925c..49ce2ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-release-2.0.tar.xz
/maven-release-2.0.tar.xz
/maven-release-2.2.tar.xz
+maven-release-2.2.1-source-release.zip
diff --git a/maven-release.spec b/maven-release.spec
index c82f7ae..4ed9eb3 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,17 +1,12 @@
Name: maven-release
-Version: 2.2
-Release: 3%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
Summary: Release a project updating the POM and tagging in the SCM
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-release-plugin/
-# tar creation instructions
-# svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.2
maven-release-2.2
-# tar cfJ maven-release-2.2.tar.xz maven-release-2.2
-Source0: maven-release-2.2.tar.xz
-# Remove jmock needed for tests and set source to 1.4 to support assert stmt
-Patch0: 001-mavenrelease-skiptests.patch
+Source0:
http://repo1.maven.org/maven2/org/apache/maven/release/%{name}/%{version}...
# Remove deps needed for tests, till jmock gets packaged
Patch1: 002-mavenrelease-fixbuild.patch
BuildArch: noarch
@@ -39,10 +34,6 @@ BuildRequires: jaxen
Requires: java
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
-
%description
This plugin is used to release a project with Maven, saving a lot of
repetitive, manual work. Releasing a project is made in two steps:
@@ -54,7 +45,6 @@ Summary: Release a project updating the POM and tagging in the
SCM
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
-BuildArch: noarch
%description manager
This package contains %{name}-manager needed by %{name}-plugin.
@@ -65,7 +55,6 @@ Summary: Release a project updating the POM and tagging in the
SCM
Group: Development/Libraries
Requires: %{name}-manager = %{version}-%{release}
Requires: jpackage-utils
-BuildArch: noarch
%description plugin
This plugin is used to release a project with Maven, saving a lot of
@@ -80,7 +69,6 @@ Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
Obsoletes: %{name}-manager-javadoc <= 2.0-1
Obsoletes: %{name}-plugin-javadoc <= 2.0-1
-BuildArch: noarch
%description javadoc
This package contains the API documentation for %{name}.
@@ -88,7 +76,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
%patch1 -p1
cat > README << EOT
%{name}-%{version}
@@ -123,35 +110,32 @@ install -pm 644 %{name}-manager/pom.xml \
install -pm 644 %{name}-plugin/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-plugin.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom
%add_maven_depmap JPP-%{name}-manager.pom %{name}-manager.jar
%add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar
%files
-%defattr(-,root,root,-)
%doc README
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/*
-
%files manager
-%defattr(-,root,root,-)
%{_javadir}/*manager*
%{_mavenpomdir}/JPP-%{name}-manager.pom
-
%files plugin
-%defattr(-,root,root,-)
%{_javadir}/*plugin*
%{_mavenpomdir}/JPP-%{name}-plugin.pom
-
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.1-1
+- Update to latest upstream release.
+- Adapt to current guidelines.
+
* Tue Jul 26 2011 Guido Grazioli <guido.grazioli(a)gmail.com> - 2.2-3
- Reinclude maven-scm-test in BRs
diff --git a/sources b/sources
index 0bc1a45..cfe0cf1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
1d135afb48bf3841f4ec4c9db5b57234 maven-release-2.2.tar.xz
+adfb662ff2b604e46b1466b369dce8a7 maven-release-2.2.1-source-release.zip