commit 6f84ddba014cb823ea3c88031bc50e283ffd4bb6 Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Wed May 9 15:11:49 2012 +0200
Completely remove main package since it was just confusing
maven2-2.2.1-jpp.patch | 445 ---------------------------------- maven2-JPackageRepositoryLayout.java | 140 ----------- maven2-MavenJPackageDepmap.java | 257 -------------------- maven2-jpp-script | 13 - maven2-script | 10 - maven2.spec | 178 ++------------ 6 files changed, 25 insertions(+), 1018 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index bd4af8f..971ef49 100644 --- a/maven2.spec +++ b/maven2.spec @@ -3,7 +3,7 @@
Name: maven2 Version: 2.2.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Java project management and project comprehension tool
Group: Development/Build Tools @@ -14,46 +14,12 @@ URL: http://maven.apache.org # tar czvf %{name}-%{version}.tar.gz apache-maven-%{version} Source0: %{name}-%{version}.tar.gz
-# Since we are using the entire dependency set "as is", we need to atleast try -# and make it so that only one version is packaged in the binary blob. This -# server an additional (and more important) purpose ... it ensures that a -# single version of each module is enough; because if not, versioned rpm names -# would be needed for those dependencies. The idea is as follows: - -# Required by maven: -# org/codehaus/plexus/1.0/plexus-1.0.jar -# org/codehaus/plexus/1.1/plexus-1.1.jar -# What we package in the blob: -# org/codehaus/plexus/1.1/plexus-1.1.jar -# org/codehaus/plexus/1.0/plexus-1.0.jar -> ../1.1/plexus-1.1.jar - -# Doing this for the hundreds of jars is a huge pain.. so we do the only -# thing sane people can. Crazy scripting magic! To generate the tarball - -# rm -rf ~/.m2 -# tar xzf SOURCE0 -# cd apache-maven-%{version} -# export M2_HOME=`pwd`/installation/apache-maven-%{version} -# ant -# cd ~/.m2 -# SOURCE100 -# Find maven-%{version}-bootstrapdeps.tar.gz in ./ -Source1: %{name}-%{version}-bootstrapdeps.tar.gz
# 1xx for non-upstream/created sources Source100: %{name}-%{version}-settings.xml -Source101: %{name}-JPackageRepositoryLayout.java -Source102: %{name}-MavenJPackageDepmap.java Source103: %{name}-%{version}-depmap.xml -Source104: %{name}-empty-dep.pom -Source105: %{name}-empty-dep.jar - -# 2xx for created non-buildable sources -Source200: %{name}-script -Source201: %{name}-jpp-script
Patch0: %{name}-antbuild.patch -Patch1: %{name}-%{version}-jpp.patch Patch2: %{name}-%{version}-update-tests.patch Patch3: %{name}-%{version}-enable-bootstrap-repo.patch Patch4: %{name}-%{version}-unshade.patch @@ -85,20 +51,6 @@ BuildRequires: maven-enforcer-plugin BuildRequires: maven-shade-plugin %endif
-Requires: classworlds -Requires: jdom - -%if !%{bootstrap} -Requires: maven-artifact-manager = %{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} -Requires: maven-plugin-descriptor = %{version}-%{release} -%endif
BuildArch: noarch
@@ -207,7 +159,6 @@ Maven toolchain artifact %setup -q -n apache-maven-2.2.1
%patch0 -b .antbuild -%patch1 -p1 -b .jpp %patch2 -b .update-tests
%if ! %{bootstrap} @@ -246,9 +197,6 @@ mkdir $M2_REPO ) %endif
-cp %{SOURCE101} maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/JPackageRepositoryLayout.java -cp %{SOURCE102} maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java - # disable parallel artifact resolution %patch5 -p1 -b .parallel-artifacts-resolution
@@ -299,51 +247,8 @@ mvn-rpmbuild -X -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.
# maven2 directory in /usr/share/java install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-########### -# M2_HOME # -########### -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} - -################ -# M2_HOME/poms # -#*############## -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/poms - -######################## -# /etc/maven/fragments # -######################## -install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/maven/fragments - -############################## -# /usr/share/java repository # -############################## -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository -ln -s %{_javadir} $RPM_BUILD_ROOT%{_datadir}/%{name}/repository/JPP - -################## -# javadir/maven2 # -#*################ -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} - -####################### -# javadir/maven2/poms # -#*##################### -ln -s %{_datadir}/%{name}/poms $RPM_BUILD_ROOT%{_javadir}/%{name}/poms - -############ -# /usr/bin # -############ -install -dm 755 $RPM_BUILD_ROOT%{_bindir} - -# Install files -install -m 644 %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2-empty-dep.pom -install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar - - -################### -# Individual jars # -###################
# parts of maven2 now go into separate subpackages for subdir in maven-artifact-manager maven-error-diagnostics \ @@ -351,97 +256,64 @@ for subdir in maven-artifact-manager maven-error-diagnostics \ maven-profile maven-project maven-toolchain maven-plugin-descriptor ;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 - %add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir - mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \ - $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir + install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$subdir.pom + %add_maven_depmap JPP.%{name}-$subdir.pom %{name}/$subdir.jar -f $subdir popd done
-# maven-reporting pom -install -m 644 maven-reporting/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven-reporting.pom -%add_to_maven_depmap org.apache.maven.reporting maven-reporting %{version} JPP/%{name} maven-reporting - -# maven pom -install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven.pom -%add_to_maven_depmap org.apache.maven maven %{version} JPP/%{name} maven - - -%files -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/poms -%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.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 -%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-descriptor.pom -%{_datadir}/%{name}/repository -%{_mavendepmapfragdir}/%{name} -%{_javadir}/%{name} -%exclude %{_javadir}/%{name}/maven-artifact-manager.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 -%exclude %{_javadir}/%{name}/maven-plugin-descriptor.jar -
%files -n maven-artifact-manager -%{_mavendepmapfragdir}/maven-artifact-manager +%{_mavendepmapfragdir}/%{name}-maven-artifact-manager %{_javadir}/%{name}/maven-artifact-manager.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom +%{_mavenpomdir}/JPP.%{name}-maven-artifact-manager.pom
%files -n maven-error-diagnostics -%{_mavendepmapfragdir}/maven-error-diagnostics +%{_mavendepmapfragdir}/%{name}-maven-error-diagnostics %{_javadir}/%{name}/maven-error-diagnostics.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-error-diagnostics.pom +%{_mavenpomdir}/JPP.%{name}-maven-error-diagnostics.pom
%files -n maven-model -%{_mavendepmapfragdir}/maven-model +%{_mavendepmapfragdir}/%{name}-maven-model %{_javadir}/%{name}/maven-model.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom +%{_mavenpomdir}/JPP.%{name}-maven-model.pom
%files -n maven-monitor -%{_mavendepmapfragdir}/maven-monitor +%{_mavendepmapfragdir}/%{name}-maven-monitor %{_javadir}/%{name}/maven-monitor.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom +%{_mavenpomdir}/JPP.%{name}-maven-monitor.pom
%files -n maven-plugin-registry -%{_mavendepmapfragdir}/maven-plugin-registry +%{_mavendepmapfragdir}/%{name}-maven-plugin-registry %{_javadir}/%{name}/maven-plugin-registry.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom +%{_mavenpomdir}/JPP.%{name}-maven-plugin-registry.pom
%files -n maven-profile -%{_mavendepmapfragdir}/maven-profile +%{_mavendepmapfragdir}/%{name}-maven-profile %{_javadir}/%{name}/maven-profile.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom +%{_mavenpomdir}/JPP.%{name}-maven-profile.pom
%files -n maven-project -%{_mavendepmapfragdir}/maven-project +%{_mavendepmapfragdir}/%{name}-maven-project %{_javadir}/%{name}/maven-project.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom +%{_mavenpomdir}/JPP.%{name}-maven-project.pom
%files -n maven-toolchain -%{_mavendepmapfragdir}/maven-toolchain +%{_mavendepmapfragdir}/%{name}-maven-toolchain %{_javadir}/%{name}/maven-toolchain.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom +%{_mavenpomdir}/JPP.%{name}-maven-toolchain.pom
%files -n maven-plugin-descriptor -%{_mavendepmapfragdir}/maven-plugin-descriptor +%{_mavendepmapfragdir}/%{name}-maven-plugin-descriptor %{_javadir}/%{name}/maven-plugin-descriptor.jar -%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-descriptor.pom +%{_mavenpomdir}/JPP.%{name}-maven-plugin-descriptor.pom
%changelog +* Wed May 9 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-33 +- Completely remove main package since it was just confusing + * Wed Jan 25 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-32 - Stip down maven 2 to bare minimum - Remove scripts and most of home