From fcf245e8abd8651134633b9f6426f7546846b6b8 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 24 Apr 2013 15:29:33 +0200 Subject: [PATCH] Build 1.1 with fake artifactId --- 0001-Temporarily-change-artifactId.patch | 25 ++++++++++++++++++++++++ maven-shared-incremental.spec | 20 ++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-Temporarily-change-artifactId.patch diff --git a/0001-Temporarily-change-artifactId.patch b/0001-Temporarily-change-artifactId.patch new file mode 100644 index 0000000..16d7519 --- /dev/null +++ b/0001-Temporarily-change-artifactId.patch @@ -0,0 +1,25 @@ +From 5ddb3244f7abe52039c9ca64e71d820f1db595ae Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 Apr 2013 15:11:12 +0200 +Subject: [PATCH] Temporarily change artifactId + +--- + pom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index f832f26..faaf394 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -26,7 +26,7 @@ + ../maven-shared-components/pom.xml + + +- maven-shared-incremental ++ maven-shared-incremental-fake + 1.1 + Maven Incremental Build support utilities + +-- +1.8.1.4 + diff --git a/maven-shared-incremental.spec b/maven-shared-incremental.spec index 8707df7..8a04190 100644 --- a/maven-shared-incremental.spec +++ b/maven-shared-incremental.spec @@ -1,11 +1,14 @@ Name: maven-shared-incremental Version: 1.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -31,13 +34,25 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 + %build %mvn_build %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} @@ -45,6 +60,9 @@ This package provides %{summary}. %doc LICENSE NOTICE %changelog +* Wed Apr 24 2013 Michal Srb - 1.1-2 +- Build 1.1 with fake artifactId + * Wed Apr 10 2013 Mikolaj Izdebski - 1.1-1 - Update to upstream version 1.1