commit f8bcf516b3d6e0c32fe89216c45228fe9734ca26 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Thu Jan 24 23:30:22 2013 +0100
Update to upstream version 3.2
- Build with xmvn
0001-Set-source-encoding-property-to-UTF8.patch | 24 --------- maven-site-plugin.spec | 62 ++++------------------ sources | 2 +- 3 files changed, 13 insertions(+), 75 deletions(-) --- diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec index 4c88f10..51489cd 100644 --- a/maven-site-plugin.spec +++ b/maven-site-plugin.spec @@ -1,6 +1,6 @@ Name: maven-site-plugin -Version: 3.1 -Release: 3%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Maven Site Plugin
Group: Development/Libraries @@ -8,13 +8,12 @@ License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-site-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%%7Bname%7D/%%7Bversi...
-Patch0: 0001-Set-source-encoding-property-to-UTF8.patch Patch1: 0002-Port-to-jetty-8.x.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-artifact-manager BuildRequires: maven-plugin-plugin BuildRequires: maven-assembly-plugin @@ -25,7 +24,7 @@ BuildRequires: maven-jar-plugin BuildRequires: maven-resources-plugin BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools -BuildRequires: maven-doxia-tools +BuildRequires: maven-doxia-tools >= 1.4-8 BuildRequires: maven-project BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit @@ -47,26 +46,6 @@ BuildRequires: plexus-velocity BuildRequires: plexus-utils BuildRequires: jetty-parent
-Requires: maven -Requires: jetty-server >= 8.1.0-0.1.rc5 -Requires: jetty-util >= 8.1.0-0.1.rc5 -Requires: jetty-webapp >= 8.1.0-0.1.rc5 -Requires: java -Requires: jpackage-utils -Requires: maven-artifact-manager -Requires: maven-doxia-tools -Requires: maven-project -Requires: maven-shared-reporting-api -Requires: maven-wagon -Requires: maven-reporting-exec -Requires: servlet3 -Requires: plexus-archiver -Requires: plexus-containers-container-default -Requires: plexus-i18n -Requires: plexus-velocity -Requires: plexus-utils -Requires: jetty-parent - Provides: maven2-plugin-site = %{version}-%{release} Obsoletes: maven2-plugin-site <= 0:2.0.8
@@ -76,49 +55,32 @@ The Maven Site Plugin is a plugin that generates a site for the current project. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc API documentation for %{name}.
%prep %setup -q -%patch0 -p1 %patch1 -p1
%build # skipping tests because we need to fix them first for jetty update -mvn-rpmbuild \ - -Dmaven.test.skip=true \ - install javadoc:javadoc +%mvn_build -f
%install -# jars -install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - -%add_maven_depmap JPP-%{name}.pom %{name}.jar +%mvn_install
-# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ - -%files +%files -f .mfiles %doc LICENSE NOTICE -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name}
-%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE -%{_javadocdir}/%{name}
%changelog +* Thu Jan 24 2013 Mikolaj Izdebski mizdebsk@redhat.com - 3.2-1 +- Update to upstream version 3.2 +- Build with xmvn + * Tue Oct 30 2012 Mikolaj Izdebski mizdebsk@redhat.com - 3.1-3 - Don't require full jetty, only minimal set of subpackages
diff --git a/sources b/sources index 4a068e4..4b02eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b54f33d09a4a43bcd8aa9f5accfa34 maven-site-plugin-3.1-source-release.zip +bdece0d7320e4a0380c865a0c3ed9b0e maven-site-plugin-3.2-source-release.zip
java-sig-commits@lists.fedoraproject.org