commit 5ee5642b356fab1762ab696d097f7fbf2b12e660
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Jan 3 18:29:14 2011 +0200
Drop tomcat5 BRs.
Drop versioned jars.
maven-release.spec | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/maven-release.spec b/maven-release.spec
index aaf4b48..8bb2ed4 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -7,14 +7,14 @@
Name: maven-release
Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?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
ttp://svn.apache.org/repos/asf//maven/release/tags/maven-release-2.0
maven-release-2.0
+# svn export
http://svn.apache.org/repos/asf//maven/release/tags/maven-release-2.0
maven-release-2.0
# tar cfJ maven-release-2.0.tar.xz maven-release-2.0
Source0: maven-release-2.0.tar.xz
Source1: maven-release-jpp-depmap.xml
@@ -23,7 +23,6 @@ Patch0: 001_mavenreleasemanager_fixbuild.patch
# Remove deps needed for tests, till jmock gets packaged
Patch1: 002_mavenreleaseplugin_skiptests.patch
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -31,23 +30,20 @@ BuildRequires: maven-scm >= 1.4-1
BuildRequires: maven-scm-test >= 1.4-1
BuildRequires: maven2
BuildRequires: maven2-common-poms >= 0:1.0-13
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
BuildRequires: plexus-maven-plugin
BuildRequires: plexus-utils
BuildRequires: maven-surefire-maven-plugin
-### FIXME tomcat5-servlet-api should require tomcat5 (parent POM)
BuildRequires: jaxen
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: tomcat5
Requires: java
Requires: jpackage-utils
@@ -130,14 +126,10 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
# jars
install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{mjarver}.jar \
- $RPM_BUILD_ROOT%{_javadir}/
-(cd $RPM_BUILD_ROOT%{_javadir} \
- && ln -sf %{name}-manager-%{mjarver}.jar %{name}-manager.jar)
+ $RPM_BUILD_ROOT%{_javadir}//%{name}-manager.jar
install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{pjarver}.jar \
- $RPM_BUILD_ROOT%{_javadir}/
-(cd $RPM_BUILD_ROOT%{_javadir} \
- && ln -sf %{name}-plugin-%{pjarver}.jar %{name}-plugin.jar)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-plugin.jar
# javadocs
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -158,11 +150,6 @@ install -pm 644 %{name}-plugin/pom.xml \
%add_to_maven_depmap org.apache.maven.release %{name}-manager %{mjarver} JPP
%{name}-manager
%add_to_maven_depmap org.apache.maven.plugins %{name}-plugin %{pjarver} JPP
%{name}-plugin
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%defattr(-,root,root,-)
%doc README
@@ -197,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0-2
+- Drop tomcat5 BRs.
+- Drop versioned jars.
+
* Mon Sep 13 2010 Guido Grazioli <guido.grazioli(a)gmail.com> - 2.0-1
- Update to upstream 2.0