commit 0d5b8a084828a8f776e5b7b0c98fb44a5466deb7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 17 13:47:27 2010 +0100
Migrate from tomca5 to tomca6
- Versionless jars and javadocs
maven-doxia.spec | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 2e3626c..113a85c 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -59,8 +59,6 @@ Patch3: %{name}-assert.patch
# will pick it up and try to instantiate
Patch5: %{name}-core-remove-plexus-component-annotation.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
@@ -86,16 +84,14 @@ BuildRequires: maven-doxia-tools
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: tomcat5-servlet-2.4-api
-BuildRequires: tomcat5
+BuildRequires: servlet25
BuildRequires: classworlds
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-logging
-BuildRequires: jakarta-commons-validator
+BuildRequires: apache-commons-validator
BuildRequires: apache-commons-configuration
BuildRequires: junit
BuildRequires: oro
-#BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
@@ -164,8 +160,6 @@ mvn-jpp \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -180,7 +174,7 @@ for targetdir in `find -type d -name target`; do
# Does the module have a jar?
if [ -f $targetdir/$modulename-%{version}.jar ]; then
cp -p $targetdir/$modulename-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename.jar
fi
@@ -202,14 +196,9 @@ install -pm 644 doxia-modules/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-
install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib
ln -s %{_javadir}/maven-doxia/logging-api.jar
$RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar
-# Install symlinks
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# javadoc (all javadocs are contained in the main module docs dir used below)
-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}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -217,8 +206,10 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%postun
%update_maven_depmap
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
%defattr(-,root,root,-)
@@ -232,7 +223,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
-* Wed Sep 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.3-2
+* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.3-2
+- Migrate from tomca5 to tomca6
+- Versionless jars and javadocs
- Remove old skip-plugin patch
- Replace add-default-role-hint patch with remove-plexus-component patch
- Rename few jakarta BRs/Rs to apache names
Show replies by date