[maven2] Add maven-error-diagnostics subpackage
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Jul 19 13:37:51 UTC 2011
commit 696f4ba9bec41462b6f86736fec64f5ad0524d37
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Jul 19 15:25:19 2011 +0200
Add maven-error-diagnostics subpackage
- Order subpackages according to alphabet
maven2.spec | 132 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 76 insertions(+), 56 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 2321880..6681d1d 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 26%{?dist}
+Release: 27%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -225,11 +225,13 @@ Requires: jakarta-oro
Requires: regexp
Requires: slf4j
Requires: velocity
-Requires: maven-project = %{version}-%{release}
Requires: maven-artifact-manager = %{version}-%{release}
-Requires: maven-profile = %{version}-%{release}
+Requires: maven-error-diagnostics = %{version}-%{release}
+Requires: maven-model = %{version}-%{release}
Requires: maven-monitor = %{version}-%{release}
Requires: maven-plugin-registry = %{version}-%{release}
+Requires: maven-profile = %{version}-%{release}
+Requires: maven-project = %{version}-%{release}
Requires: maven-toolchain = %{version}-%{release}
%endif
@@ -240,20 +242,6 @@ Apache Maven is a software project management and comprehension tool. Based on
the concept of a project object model (POM), Maven can manage a project's
build, reporting and documentation from a central piece of information.
-%package -n maven-project
-Group: Development/Libraries
-Summary: Compatibility Maven project artifact
-Requires: jpackage-utils
-Requires: maven-artifact-manager
-Requires: maven-profile
-Requires: maven-plugin-registry
-Requires: plexus-interpolation
-Requires: plexus-utils
-Requires: plexus-containers-container-default
-
-%description -n maven-project
-Maven project artifact
-
%package -n maven-artifact-manager
Group: Development/Libraries
Summary: Compatibility Maven artifact manager artifact
@@ -267,24 +255,14 @@ Requires: maven-wagon
%description -n maven-artifact-manager
Maven artifact manager artifact
-%package -n maven-profile
+%package -n maven-error-diagnostics
Group: Development/Libraries
-Summary: Compatibility Maven profile artifact
+Summary: Compatibility Maven error diagnostics artifact
Requires: jpackage-utils
-Requires: plexus-utils
-Requires: plexus-interpolation
Requires: plexus-containers-container-default
-%description -n maven-profile
-Maven profile artifact
-
-%package -n maven-monitor
-Group: Development/Libraries
-Summary: Compatibility Maven monitor artifact
-Requires: jpackage-utils
-
-%description -n maven-monitor
-Maven monitor artifact
+%description -n maven-error-diagnostics
+Maven error diagnostics artifact
%package -n maven-model
Group: Development/Libraries
@@ -295,6 +273,14 @@ Requires: plexus-utils
%description -n maven-model
Maven model artifact
+%package -n maven-monitor
+Group: Development/Libraries
+Summary: Compatibility Maven monitor artifact
+Requires: jpackage-utils
+
+%description -n maven-monitor
+Maven monitor artifact
+
%package -n maven-plugin-registry
Group: Development/Libraries
Summary: Compatibility Maven plugin registry artifact
@@ -306,6 +292,31 @@ Requires: plexus-containers-container-default
%description -n maven-plugin-registry
Maven plugin registry artifact
+%package -n maven-profile
+Group: Development/Libraries
+Summary: Compatibility Maven profile artifact
+Requires: jpackage-utils
+Requires: plexus-utils
+Requires: plexus-interpolation
+Requires: plexus-containers-container-default
+
+%description -n maven-profile
+Maven profile artifact
+
+%package -n maven-project
+Group: Development/Libraries
+Summary: Compatibility Maven project artifact
+Requires: jpackage-utils
+Requires: maven-artifact-manager
+Requires: maven-profile
+Requires: maven-plugin-registry
+Requires: plexus-interpolation
+Requires: plexus-utils
+Requires: plexus-containers-container-default
+
+%description -n maven-project
+Maven project artifact
+
%package -n maven-toolchain
Group: Development/Libraries
Summary: Compatibility Maven toolchain artifact
@@ -505,9 +516,9 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
###################
# parts of maven2 now go into separate subpackages
-for subdir in maven-artifact-manager maven-project \
- maven-plugin-registry maven-monitor maven-model \
- maven-profile maven-toolchain;do
+for subdir in maven-artifact-manager maven-error-diagnostics \
+ maven-model maven-monitor maven-plugin-registry \
+ maven-profile maven-project maven-toolchain;do
pushd $subdir
install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
@@ -529,7 +540,6 @@ for file in \
maven-artifact/target/maven-artifact-%{version}.jar \
maven-repository-metadata/target/maven-repository-metadata-%{version}.jar \
maven-plugin-api/target/maven-plugin-api-%{version}.jar \
- maven-error-diagnostics/target/maven-error-diagnostics-%{version}.jar \
maven-compat/target/maven-compat-%{version}.jar \
maven-core/target/maven-core-%{version}.jar \
maven-plugin-descriptor/target/maven-plugin-descriptor-%{version}.jar; do \
@@ -543,8 +553,7 @@ for file in \
pushd $DIR
- install -m 644 $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/
- ln -s $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/$UNVER_NAME
+ install -m 644 $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/$UNVER_NAME
install -m 644 ../pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$UNVER_NAME_WITH_NO_EXT.pom
%add_to_maven_depmap org.apache.maven $ARTIFACT %{version} JPP/%{name} $UNVER_NAME_WITH_NO_EXT
popd
@@ -592,21 +601,23 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%{_datadir}/%{name}/lib
%{_datadir}/%{name}/poms
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
-%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
-%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
-%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-error-diagnostics.pom
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
%{_datadir}/%{name}/repository
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%exclude %{_javadir}/%{name}/maven-artifact-manager.jar
-%exclude %{_javadir}/%{name}/maven-project.jar
-%exclude %{_javadir}/%{name}/maven-plugin-registry.jar
-%exclude %{_javadir}/%{name}/maven-monitor.jar
+%exclude %{_javadir}/%{name}/maven-error-diagnostics.jar
%exclude %{_javadir}/%{name}/maven-model.jar
+%exclude %{_javadir}/%{name}/maven-monitor.jar
+%exclude %{_javadir}/%{name}/maven-plugin-registry.jar
%exclude %{_javadir}/%{name}/maven-profile.jar
+%exclude %{_javadir}/%{name}/maven-project.jar
%exclude %{_javadir}/%{name}/maven-toolchain.jar
@@ -615,36 +626,41 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%endif
%doc
-%files -n maven-project
-%{_mavendepmapfragdir}/maven-project
-%{_javadir}/%{name}/maven-project.jar
-%{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
-
%files -n maven-artifact-manager
%{_mavendepmapfragdir}/maven-artifact-manager
%{_javadir}/%{name}/maven-artifact-manager.jar
%{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
-%files -n maven-plugin-registry
-%{_mavendepmapfragdir}/maven-plugin-registry
-%{_javadir}/%{name}/maven-plugin-registry.jar
-%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
+%files -n maven-error-diagnostics
+%{_mavendepmapfragdir}/maven-error-diagnostics
+%{_javadir}/%{name}/maven-error-diagnostics.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-error-diagnostics.pom
+
+%files -n maven-model
+%{_mavendepmapfragdir}/maven-model
+%{_javadir}/%{name}/maven-model.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
%files -n maven-monitor
%{_mavendepmapfragdir}/maven-monitor
%{_javadir}/%{name}/maven-monitor.jar
%{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
-%files -n maven-model
-%{_mavendepmapfragdir}/maven-model
-%{_javadir}/%{name}/maven-model.jar
-%{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
+%files -n maven-plugin-registry
+%{_mavendepmapfragdir}/maven-plugin-registry
+%{_javadir}/%{name}/maven-plugin-registry.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
%files -n maven-profile
%{_mavendepmapfragdir}/maven-profile
%{_javadir}/%{name}/maven-profile.jar
%{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+%files -n maven-project
+%{_mavendepmapfragdir}/maven-project
+%{_javadir}/%{name}/maven-project.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
+
%files -n maven-toolchain
%{_mavendepmapfragdir}/maven-toolchain
%{_javadir}/%{name}/maven-toolchain.jar
@@ -652,6 +668,10 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%changelog
+* Tue Jul 19 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-27
+- Add maven-error-diagnostics subpackage
+- Order subpackages according to alphabet
+
* Tue Jul 19 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-26
- Unown jars contained in subpackages (#723124)
More information about the scm-commits
mailing list