[maven-shared-incremental] Build with original POM file

Michal Srb msrb at fedoraproject.org
Thu Apr 25 05:45:52 UTC 2013


commit 5be1f73310d3c881d175d5af8560f32cdaa47c5e
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Apr 24 16:02:05 2013 +0200

    Build with original POM file
    
    - Temporarily provide fake artifactId

 0001-Temporarily-change-artifactId.patch |   25 -------------------------
 maven-shared-incremental.spec            |   22 +++++++---------------
 2 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/maven-shared-incremental.spec b/maven-shared-incremental.spec
index 8a04190..a353b25 100644
--- a/maven-shared-incremental.spec
+++ b/maven-shared-incremental.spec
@@ -1,14 +1,11 @@
 Name:           maven-shared-incremental
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Incremental Build support utilities
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://maven.apache.org/shared/maven-shared-incremental/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-
-Patch0:         0001-Temporarily-change-artifactId.patch
-
 BuildArch:      noarch
 
 BuildRequires:  maven-local
@@ -34,7 +31,8 @@ This package provides %{summary}.
 %prep
 %setup -q
 
-%patch0 -p1
+# temporarily provide fake artifactId
+%mvn_alias ":{*}" :@1-fake
 
 %build
 %mvn_build
@@ -42,17 +40,7 @@ This package provides %{summary}.
 %install
 %mvn_install
 
-# Preserve older JAR and POM for a while. This is only temporary solution needed for updating
-# maven-compiler-plugin to latest version
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared-incremental
-cp /usr/share/java/maven-shared-incremental/maven-shared-incremental.jar %{buildroot}/usr/share/java/maven-shared-incremental/maven-shared-incremental.jar
-cp /usr/share/maven-poms/JPP.maven-shared-incremental-maven-shared-incremental.pom %{buildroot}/usr/share/maven-poms/JPP.maven-shared-incremental-maven-shared-incremental.pom
-cp /usr/share/maven-fragments/maven-shared-incremental.xml %{buildroot}/usr/share/maven-fragments/maven-shared-incremental-orig.xml
-
 %files -f .mfiles
-%{_javadir}/maven-shared-incremental/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 %doc LICENSE NOTICE
 %dir %{_javadir}/%{name}
 
@@ -60,6 +48,10 @@ cp /usr/share/maven-fragments/maven-shared-incremental.xml %{buildroot}/usr/shar
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Apr 24 2013 Michal Srb <msrb at redhat.com> - 1.1-3
+- Build with original POM file
+- Temporarily provide fake artifactId
+
 * Wed Apr 24 2013 Michal Srb <msrb at redhat.com> - 1.1-2
 - Build 1.1 with fake artifactId
 


More information about the scm-commits mailing list