commit 808d9257cd4bbaba99dc32bd87f7cbe4a24bb3e5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 26 13:39:57 2011 +0200
Update to new upstream version.
.gitignore | 1 +
add-jetty-util.patch | 19 -------------------
add-servlet-dep.patch | 19 +++++++++++++++++++
maven-site-plugin.spec | 43 +++++++++++++++----------------------------
sources | 2 +-
5 files changed, 36 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 294e358..3f18684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-site-plugin-2.1.tar.xz
+maven-site-plugin-2.2-source-release.zip
diff --git a/add-servlet-dep.patch b/add-servlet-dep.patch
new file mode 100644
index 0000000..fb49e32
--- /dev/null
+++ b/add-servlet-dep.patch
@@ -0,0 +1,19 @@
+--- pom.xml.sav 2010-11-25 20:08:18.000000000 +0200
++++ pom.xml 2011-01-26 13:26:55.152418368 +0200
+@@ -351,6 +351,16 @@ under the License.
+ <artifactId>jetty</artifactId>
+ <version>6.1.5</version>
+ </dependency>
++ <dependency>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ <version>2.5</version>
++ </dependency>
++ <dependency>
++ <groupId>org.mortbay.jetty</groupId>
++ <artifactId>jetty-util</artifactId>
++ <version>6.1.24</version>
++ </dependency>
+
+ <!-- test -->
+ <dependency>
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 934d053..99652ee 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,34 +1,30 @@
Name: maven-site-plugin
-Version: 2.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Maven Site Plugin
Group: Development/Libraries
License: ASL 2.0
URL:
http://maven.apache.org/plugins/maven-site-plugin/
-#svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.1
maven-site-plugin-2.1
-#tar caf maven-site-plugin-2.1.tar.xz maven-site-plugin-2.1/
-Source0: %{name}-%{version}.tar.xz
-Patch0: remove-prereqs.patch
-Patch1: add-jetty-util.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: add-servlet-dep.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-assembly
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-assembly-plugin
BuildRequires: plexus-maven-plugin
BuildRequires: maven-compiler-plugin
-BuildRequires: maven2-plugin-install
+BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
@@ -41,7 +37,6 @@ Requires: maven-doxia-tools
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-
Provides: maven2-plugin-site = %{version}-%{release}
Obsoletes: maven2-plugin-site <= 0:2.0.8
@@ -56,31 +51,23 @@ Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
%patch0
-%patch1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp \
+mvn-local \
-e \
- -Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-site-plugin %{version} JPP
maven-site-plugin
@@ -101,9 +88,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -116,6 +100,9 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-1
+- Update to new upstream version.
+
* Tue Jun 15 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.1-3
- Requires maven-doxia-tools.
diff --git a/sources b/sources
index 067f39f..61af61d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d59fd7ef4947a992a2b9b99f0f302eb2 maven-site-plugin-2.1.tar.xz
+7e323342e3a7298678cf1535a97a1253 maven-site-plugin-2.2-source-release.zip