commit ce7649f97e4d610c50e11cd2b2037aac3299d088
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Mar 20 10:21:34 2013 +0100
Update to latest packaging guidelines
- Remove several unneeded buildrequires
0002-Fix-maven3-compatibility.patch | 27 ---------
0003-Fix-OpenJDK7-compatibility.patch | 16 ------
plexus-containers.spec | 96 +++++++++-----------------------
3 files changed, 27 insertions(+), 112 deletions(-)
---
diff --git a/plexus-containers.spec b/plexus-containers.spec
index fcff9dd..e1dc3b7 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -10,10 +10,9 @@
Name: %{parent}-%{subname}
Version: 1.5.5
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and MIT
-Group: Development/Libraries
URL:
http://plexus.codehaus.org/
# svn export \
#
http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1...
@@ -24,25 +23,15 @@ Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
Patch0: 0001-Fix-test-oom.patch
-Patch1: 0002-Fix-maven3-compatibility.patch
-Patch2: 0003-Fix-OpenJDK7-compatibility.patch
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
-BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin = %{javadoc_plugin_version}
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-shared-invoker
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-doxia
-BuildRequires: maven-doxia-sitetools
BuildRequires: maven-release
BuildRequires: maven-plugin-plugin
BuildRequires: plexus-classworlds
@@ -67,34 +56,24 @@ is like a J2EE application server, without all the baggage.
%package component-metadata
Summary: Component metadata from %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: plexus-cli
%description component-metadata
%{summary}.
%package component-javadoc
Summary: Javadoc component from %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
%description component-javadoc
%{summary}.
-
%package component-annotations
Summary: Component API from %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
%description component-annotations
%{summary}.
%package container-default
Summary: Default Container from %{name}
-Group: Development/Libraries
-Requires: %{name}-component-annotations = %{version}-%{release}
Provides: plexus-containers-component-api = %{version}-%{release}
%description container-default
@@ -103,7 +82,6 @@ Provides: plexus-containers-component-api =
%{version}-%{release}
%package javadoc
Summary: API documentation for all plexus-containers packages
Group: Documentation
-Requires: jpackage-utils
Provides: %{name}-component-annotations-javadoc = %{version}-%{release}
Obsoletes: %{name}-component-annotations-javadoc < %{version}-%{release}
Provides: %{name}-component-javadoc-javadoc = %{version}-%{release}
@@ -123,8 +101,16 @@ cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+# For Maven 3 compat
+%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
+
+# OpenJDK7 compatibility
+%pom_xpath_replace
"pom:profile[pom:id[text()='default-tools.jar']]/pom:activation" "
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+" plexus-component-javadoc
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
@@ -132,48 +118,17 @@ mkdir -p plexus-component-annotations/src/test/java
# integration tests fix
sed -i "s|<version>2.3</version>|<version>
%{javadoc_plugin_version}</version>|"
plexus-component-javadoc/src/it/basic/pom.xml
-%build
-
-mvn-rpmbuild -Dmaven.test.skip=true install
+# plexus-component-api has been merged into plexus-container-default
+%mvn_alias ":plexus-container-default"
"org.codehaus.plexus:containers-component-api"
-# for integration tests ran during javadoc:javadoc
-for file in
$MAVEN_REPO_LOCAL/org/apache/maven/plugins/maven-javadoc-plugin/%{javadoc_plugin_version}/*;do
- sha1sum $file | awk '{print $1}' > $ile.sha1
-done
+# plexus-containers pom goes into main package
+%mvn_package ":plexus-containers" ""
-mvn-rpmbuild javadoc:aggregate
+%build
+%mvn_build -f -s -d
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-annotations.jar
-install -pm 644 plexus-container-default/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-container-default.jar
-install -pm 644 plexus-component-metadata/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-metadata.jar
-install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-javadoc.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-
-install -pm 644 plexus-component-annotations/pom.xml \
-
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-annotations.pom
-install -pm 644 plexus-container-default/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-container-default.pom
-install -pm 644 plexus-component-metadata/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-metadata.pom
-install -pm 644 plexus-component-javadoc/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-javadoc.pom
-
-%add_maven_depmap JPP.%{parent}-%{subname}.pom
-%add_maven_depmap JPP.%{parent}-%{subname}-component-annotations.pom
%{parent}/%{subname}-component-annotations.jar -f component-annotations
-# component-api is now folded into container-default
-%add_maven_depmap JPP.%{parent}-%{subname}-container-default.pom
%{parent}/%{subname}-container-default.jar -a
"org.codehaus.plexus:containers-component-api" -f container-default
-%add_maven_depmap JPP.%{parent}-%{subname}-component-metadata.pom
%{parent}/%{subname}-component-metadata.jar -f component-metadata
-%add_maven_depmap JPP.%{parent}-%{subname}-component-javadoc.pom
%{parent}/%{subname}-component-javadoc.jar -f component-javadoc
+%mvn_install
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -181,15 +136,18 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files -f .mfiles
-%files component-annotations -f .mfiles-component-annotations
-%files container-default -f .mfiles-container-default
-%files component-metadata -f .mfiles-component-metadata
-%files component-javadoc -f .mfiles-component-javadoc
+%files component-annotations -f .mfiles-plexus-component-annotations
+%files container-default -f .mfiles-plexus-container-default
+%files component-metadata -f .mfiles-plexus-component-metadata
+%files component-javadoc -f .mfiles-plexus-component-javadoc
-%files javadoc
-%doc %{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
%changelog
+* Wed Mar 20 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5.5-10
+- Update to latest packaging guidelines
+- Remove several unneeded buildrequires
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.5-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild