[java-sig-commits] [maven-doxia-sitetools] Adapt to current guidelines.

[Alexander Kurtakov]

commit 640d09698cbc7db39f961a57b48d67f779dc1ce2
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Dec 17 12:47:15 2010 +0200

    Adapt to current guidelines.

 maven-doxia-sitetools.spec |   44 ++++++++++++++++++--------------------------
 1 files changed, 18 insertions(+), 26 deletions(-)
---
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 56a53b6..5abeef8 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -33,7 +33,7 @@
 
 Name:           %{parent}-%{subproj}
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -50,8 +50,6 @@ Source1:    maven-doxia-depmap.xml
 Patch0:         %{name}-clirr.patch
 Patch1:         %{name}-disablehtmlunit.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  itext >= 2.1.7
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2
@@ -69,30 +67,28 @@ BuildRequires:  plexus-maven-plugin >= 0:1.2-2
 BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
 BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
 BuildRequires:  classworlds
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-configuration
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-configuration
 BuildRequires:  apache-commons-logging
-BuildRequires:  jakarta-commons-validator
+BuildRequires:  apache-commons-validator
 BuildRequires:  junit
-BuildRequires:  oro
+BuildRequires:  jakarta-oro
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-containers-component-javadoc
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-utils >= 1.5.7
 BuildRequires:  plexus-velocity
-BuildRequires:  tomcat5
-BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  velocity
 
 Requires:       classworlds
-Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-configuration
-Requires:       jakarta-commons-logging
-Requires:       jakarta-commons-validator
+Requires:       apache-commons-collections
+Requires:       apache-commons-configuration
+Requires:       apache-commons-logging
+Requires:       apache-commons-validator
 Requires:       junit
 Requires:       maven-doxia
-Requires:       oro
+Requires:       jakarta-oro
 Requires:       plexus-container-default
 Requires:       plexus-containers-container-default
 Requires:       plexus-i18n
@@ -173,21 +169,14 @@ install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
 
 install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{version}.jar \
-	$RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model-%{version}.jar
+	$RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model.jar
 install -m 644 -p doxia-site-renderer/target/doxia-site-renderer-%{version}.jar \
-	$RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer-%{version}.jar
+	$RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer.jar
 install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
-	$RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
-  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+	$RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer.jar
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
 %defattr(-,root,root,-)
@@ -200,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako at redhat.com> 1.1.3-2
+- Adapt to current guidelines.
+
 * Tue Sep  7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.3-1
 - Update to 1.1.3
 - Enable javadoc generation again