11:41 a.m.
commit c6cc9f5ba8bc7da8838d5d6b8a95bc2bc56adac7
Author: mbooth <fedora(a)matbooth.co.uk>
Date: Sun Mar 13 16:40:03 2011 +0000
- Maven plug-in sub-package should require the core package.
- Use _mavenpomdir macro.
- Don't install versioned javadocs.
maven-jxr.spec | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 6481545..6126bb5 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -30,7 +30,7 @@
Name: maven-jxr
Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Source cross referencing tool
License: ASL 2.0
@@ -86,6 +86,7 @@ API documentation for %{name}.
%package -n maven-plugin-jxr
Summary: Maven plugin for JXR
Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
%description -n maven-plugin-jxr
Maven plugin for JXR.
@@ -114,15 +115,15 @@ mkdir -p $MAVEN_REPO_LOCAL
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
install -pm 644 maven-jxr/target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.jxr jxr %{version} JPP %{name}-parent
%add_to_maven_depmap org.apache.maven maven-jxr %{version} JPP %{name}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
-install -pm 644 maven-jxr/pom.xml
$RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-parent.pom
+install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
# maven-jxr plugin
%add_to_maven_depmap org.apache.maven.plugins maven-jxr-plugin %{version} JPP
maven-plugin-jxr
@@ -130,15 +131,13 @@ install -pm 644
maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr.jar
install -pm 644 maven-jxr-plugin/pom.xml \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-jxr.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-plugin-jxr.pom
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -152,10 +151,16 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%postun -n maven-plugin-jxr
%update_maven_depmap
+%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,-)
%{_javadir}/%{name}*.jar
-%{_datadir}/maven2
+%{_mavenpomdir}/JPP-%{name}-parent.pom
+%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
@@ -164,9 +169,15 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files -n maven-plugin-jxr
%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-maven-plugin-jxr.pom
%{_javadir}/maven-plugin-jxr*.jar
%changelog
+* Sun Mar 13 2011 Mat Booth <fedora(a)matbooth.co.uk> 0:2.2-3
+- Maven plug-in sub-package should require the core package.
+- Use _mavenpomdir macro.
+- Don't install versioned javadocs.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild