[geronimo-parent-poms] Remove genesis poms from package (split into separate package)

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Sep 7 15:05:12 UTC 2011 

commit c1174be940bedef003c4ffa43f41b078c804a14c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Sep 7 16:54:07 2011 +0200

    Remove genesis poms from package (split into separate package)
    
    - Use new macro for depmaps

 genesis-config.pom                             |   61 ---
 genesis-parent.pom                             |  377 -------------------
 genesis-project-config.pom                     |  462 ------------------------
 geronimo-parent-poms-parent.patch              |   15 +
 geronimo-parent-poms-remove-dependencies.patch |  177 ---------
 geronimo-parent-poms.spec                      |   96 +----
 specs-parent.pom => pom.xml                    |    0
 7 files changed, 35 insertions(+), 1153 deletions(-)
---
diff --git a/geronimo-parent-poms-parent.patch b/geronimo-parent-poms-parent.patch
new file mode 100644
index 0000000..480abe4
--- /dev/null
+++ b/geronimo-parent-poms-parent.patch
@@ -0,0 +1,15 @@
+--- pom.xml	2011-08-07 04:03:40.000000000 +0200
++++ pom.xml.new	2011-09-07 16:25:07.365605272 +0200
+@@ -22,12 +22,6 @@
+ 
+     <modelVersion>4.0.0</modelVersion>
+ 
+-    <parent>
+-        <groupId>org.apache.geronimo.genesis.config</groupId>
+-        <artifactId>project-config</artifactId>
+-        <version>1.5</version>
+-    </parent>
+-
+     <groupId>org.apache.geronimo.specs</groupId>
+     <artifactId>specs-parent</artifactId>
+     <packaging>pom</packaging>
diff --git a/geronimo-parent-poms.spec b/geronimo-parent-poms.spec
index 6aa966c..5504f44 100644
--- a/geronimo-parent-poms.spec
+++ b/geronimo-parent-poms.spec
@@ -1,8 +1,6 @@
-%global genesis_version 1.5
-
 Name:		geronimo-parent-poms
 Version:	1.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Parent POM files for geronimo-specs
 
 Group:		Development/Tools
@@ -10,70 +8,31 @@ License:	ASL 2.0
 URL:		http://geronimo.apache.org/
 
 # Following the parent chain all the way up ...
-# http://svn.apache.org/repos/asf/geronimo/specs/tags/specs-parent-%{version}/pom.xml
-Source0:	specs-parent.pom
-# http://svn.apache.org/repos/asf/geronimo/genesis/tags/genesis-%{genesis_version}/config/project-config/pom.xml
-Source1:	genesis-project-config.pom
-# http://svn.apache.org/repos/asf/geronimo/genesis/tags/genesis-%{genesis_version}/config/pom.xml
-Source2:	genesis-config.pom
-# http://svn.apache.org/repos/asf/geronimo/genesis/tags/genesis-%{genesis_version}/pom.xml
-Source3:	genesis-parent.pom
+Source0:	http://svn.apache.org/repos/asf/geronimo/specs/tags/specs-parent-%{version}/pom.xml
 
 # Remove dependencies from POMs that aren't yet in Fedora
-Patch0:		geronimo-parent-poms-remove-dependencies.patch
-
-BuildRequires:	jpackage-utils >= 1.7.3
-Requires(post):	jpackage-utils >= 1.7.3
-Requires(postun):	jpackage-utils >= 1.7.3
+Patch0:		%{name}-parent.patch
 
-Provides:	genesis-project-config = %{genesis_version}
-Provides:	genesis-config = %{genesis_version}
-Provides:	genesis-parent = %{genesis_version}
+BuildRequires:	jpackage-utils
 
 BuildArch:	noarch
 
 # Dependencies and plugins from the POM files
-Requires:	apache-resource-bundles
-Requires:	junit
-Requires:	maven2-common-poms
-Requires:	maven2-plugin-antrun
-Requires:	maven2-plugin-assembly
-Requires:	maven2-plugin-clean
-Requires:	maven2-plugin-compiler
-Requires:	maven2-plugin-dependency
-Requires:	maven2-plugin-deploy
-Requires:	maven2-plugin-eclipse
-Requires:	maven2-plugin-enforcer
-Requires:	maven2-plugin-gpg
-Requires:	maven2-plugin-idea
-Requires:	maven2-plugin-install
-Requires:	maven2-plugin-jar
-Requires:	maven2-plugin-javadoc
-Requires:	maven2-plugin-one
-Requires:	maven2-plugin-plugin
-Requires:	maven2-plugin-pmd
-Requires:	maven2-plugin-project-info-reports
-Requires:	maven2-plugin-rar
-Requires:	maven2-plugin-remote-resources
-Requires:	maven2-plugin-site
-Requires:	maven2-plugin-source
-Requires:	maven2-plugin-stage
-Requires:	maven2-plugin-war
-Requires:	maven-archiver
-Requires:	maven-plugin-build-helper
+Requires:	maven-compiler-plugin
+Requires:	maven-idea-plugin
+Requires:	maven-jar-plugin
+Requires:	maven-pmd-plugin
 Requires:	maven-plugin-bundle
-Requires:	maven-plugin-jxr
-Requires:	maven-surefire-maven-plugin
-Requires:	maven-surefire-report-maven-plugin
-Requires:	maven-wagon
+
+Provides:       geronimo-specs = %{version}-%{release}
 
 %description
 The Project Object Model files for the geronimo-specs modules.
 
 %prep
 %setup -c -T
-cp %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 .
-%patch0 -p1
+cp %SOURCE0 .
+%patch0
 
 %build
 # Nothing to do ...
@@ -81,35 +40,20 @@ cp %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 .
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 
-install -pm 644 specs-parent.pom \
+install -pm 644 pom.xml \
 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-geronimo-specs.pom
-%add_to_maven_depmap org.apache.geronimo.specs specs %{version} JPP geronimo-specs
-%add_to_maven_depmap org.apache.geronimo.specs specs-parent %{version} JPP geronimo-specs
-
-install -pm 644 genesis-project-config.pom \
-	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-geronimo-genesis-project-config.pom
-%add_to_maven_depmap org.apache.geronimo.genesis.config project-config %{genesis_version} JPP geronimo-genesis-project-config
-
-install -pm 644 genesis-config.pom \
-	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-geronimo-genesis-config.pom
-%add_to_maven_depmap org.apache.geronimo.genesis.config config %{genesis_version} JPP geronimo-genesis-config
-
-install -pm 644 genesis-parent.pom \
-	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-geronimo-genesis.pom
-%add_to_maven_depmap org.apache.geronimo.genesis genesis %{genesis_version} JPP geronimo-genesis
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-geronimo-specs.pom -a 'org.apache.geronimo.specs:specs'
 
 %files
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*.pom
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-geronimo-specs.pom
 
 
 %changelog
+* Wed Sep  7 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.6-6
+- Remove genesis poms from package (split into separate package)
+- Use new macro for depmaps
+
 * Thu May  5 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.6-5
 - Add compatibility depmap for geronimo.specs:specs-parent
 - Fixes according to new guidelines
diff --git a/specs-parent.pom b/pom.xml
similarity index 100%
rename from specs-parent.pom
rename to pom.xml

More information about the scm-commits mailing list