[java-sig-commits] [maven-doxia-sitetools] Remove dependency on plexux-xmlrpc

[Stanislav Ochotnicky]

commit c508fc4bbf9ef80f0a1185cdc16f1d566fa89e28
Author: Stanislav Ochotnicky 
Date:   Fri Jan 27 13:34:41 2012 +0100

Remove dependency on plexux-xmlrpc

- Add BR/R on java 1.7.0+

maven-doxia-sitetools.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index fffd9b8..096d760 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -33,7 +33,7 @@

Name:           %{parent}-%{subproj}
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -48,6 +48,7 @@ Patch0:         0001-Remove-clirr-dependency.patch
 Patch1:         0002-Remove-htmlunit-dependency.patch
 Patch2:         0003-Migration-to-component-metadata.patch

+BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  itext
 BuildRequires:  jpackage-utils
 BuildRequires:  maven
@@ -62,7 +63,6 @@ BuildRequires:  maven-shared-reporting-impl
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia
 BuildRequires:  modello-maven-plugin
-BuildRequires:  plexus-xmlrpc
 BuildRequires:  classworlds
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-configuration
@@ -78,6 +78,7 @@ BuildRequires:  plexus-i18n
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  velocity
+BuildRequires:  %{_javadir}/javamail/mail.jar

Requires:       classworlds
 Requires:       apache-commons-collections
@@ -93,8 +94,9 @@ Requires:       plexus-i18n
 Requires:       plexus-utils
 Requires:       plexus-velocity
 Requires:       velocity
+Requires:       %{_javadir}/javamail/mail.jar

-Requires:       java >= 1:1.6.0
+Requires:       java >= 1:1.7.0
 Requires:       jpackage-utils

BuildArch:      noarch
@@ -176,6 +178,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}

%changelog
+* Fri Jan 27 2012 Stanislav Ochotnicky  - 1.2-3
+- Remove dependency on plexux-xmlrpc
+- Add BR/R on java 1.7.0+
+
 * Mon Jan 09 2012 Jaromir Capik  - 1.2-2
 - Migration from plexus-maven-plugin to plexus-containers-component-metadata
 - Minor spec file changes according to the latest guidelines