commit 43559112903060fe4a8d38ad0f2d67c77bad60de Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Fri Jun 24 16:38:12 2011 +0200
Add new subpackages and fix few requires
maven2.spec | 130 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 104 insertions(+), 26 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index dc193bb..8b1e059 100644 --- a/maven2.spec +++ b/maven2.spec @@ -241,11 +241,11 @@ 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 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils
%description -n maven-project Maven project artifact @@ -259,12 +259,50 @@ Requires: plexus-utils Requires: plexus-containers-container-default Requires: backport-util-concurrent Requires: maven-wagon -Requires(post): jpackage-utils -Requires(postun): jpackage-utils
%description -n maven-artifact-manager Maven artifact manager 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-monitor +Group: Development/Libraries +Summary: Compatibility Maven monitor artifact +Requires: jpackage-utils + +%description -n maven-monitor +Maven monitor artifact + +%package -n maven-model +Group: Development/Libraries +Summary: Compatibility Maven model artifact +Requires: jpackage-utils +Requires: plexus-utils + +%description -n maven-model +Maven model artifact + +%package -n maven-plugin-registry +Group: Development/Libraries +Summary: Compatibility Maven plugin registry artifact +Requires: jpackage-utils +Requires: plexus-utils +Requires: plexus-interpolation +Requires: plexus-containers-container-default + +%description -n maven-plugin-registry +Maven plugin registry artifact + + %prep %setup -q -n apache-maven-2.2.1
@@ -475,25 +513,62 @@ popd mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+subdir="maven-plugin-registry" +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 +%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir +popd + +mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ + $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir + +subdir="maven-monitor" +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 +%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir +popd + +mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ + $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir + +subdir="maven-model" +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 +%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir +%add_to_maven_depmap org.apache.maven maven-model-v3 %{version} JPP/%{name} $subdir +popd + +mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ + $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir + +subdir="maven-profile" +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 +%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir +popd + +mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ + $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir + for file in \ maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \ maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \ apache-maven/target/apache-maven-%{version}.jar \ - maven-profile/target/maven-profile-%{version}.jar \ maven-artifact-test/target/maven-artifact-test-%{version}.jar \ - maven-monitor/target/maven-monitor-%{version}.jar \ maven-toolchain/target/maven-toolchain-%{version}.jar \ maven-toolchain/target/original-maven-toolchain-%{version}.jar \ maven-settings/target/maven-settings-%{version}.jar \ maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \ - maven-model/target/maven-model-%{version}.jar \ 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-registry/target/maven-plugin-registry-%{version}.jar \ maven-plugin-descriptor/target/maven-plugin-descriptor-%{version}.jar; do \
FNAME=`basename $file` @@ -541,24 +616,6 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven ) %endif
-%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%post -n maven-project -%update_maven_depmap - -%postun -n maven-project -%update_maven_depmap - -%post -n maven-artifact-manager -%update_maven_depmap - -%postun -n maven-artifact-manager -%update_maven_depmap - %files %attr(0755,root,root) %{_bindir}/mvn %attr(0755,root,root) %{_bindir}/mvn-jpp @@ -592,9 +649,30 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven %{_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-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-profile +%{_mavendepmapfragdir}/maven-profile +%{_javadir}/%{name}/maven-profile.jar +%{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom +
%changelog * Fri Jun 24 2011 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-24 +- Add few new subpackages - Add several missing requires to new subpackages
* Fri Jun 24 2011 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-23