[fusesource-pom/f18] Install LICENSE file

Tomas Radej tradej at fedoraproject.org
Tue Sep 4 15:11:03 UTC 2012


commit 29598d7e7290d8c9c0c3848f91df0d81f6935934
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Sep 4 13:59:21 2012 +0200

    Install LICENSE file
    
    - Convert patch to POM macro

 fusesource-pom-1.5-pom.patch |   17 -----------------
 fusesource-pom.spec          |   14 ++++++++++----
 sources                      |    1 +
 3 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/fusesource-pom.spec b/fusesource-pom.spec
index f3d9f2a..f69039e 100644
--- a/fusesource-pom.spec
+++ b/fusesource-pom.spec
@@ -1,6 +1,6 @@
 Name:             fusesource-pom
 Version:          1.5
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Parent POM for FuseSource Maven projects
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -9,7 +9,7 @@ URL:              http://fusesource.com/
 # mkdir -p fusesource-pom-1.5 && cd fusesource-pom-1.5 && wget -U "" http://repo1.maven.org/maven2/org/fusesource/fusesource-pom/1.5/fusesource-pom-1.5.pom  && mv fusesource-pom-1.5.pom pom.xml && cd ..
 # tar cjf fusesource-pom-1.5.tar.bz2 fusesource-pom-1.5
 Source0:          %{name}-%{version}.tar.bz2
-Patch0:           %{name}-%{version}-pom.patch
+Source1:          http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:        noarch
 
@@ -31,7 +31,7 @@ Requires:         maven-remote-resources-plugin
 Requires:         maven-resources-plugin
 Requires:         maven-source-plugin
 Requires:         maven-surefire-plugin
-# clirr-maven-plugin depdendency removed by patch
+# clirr-maven-plugin depdendency removed with pom macro
 Requires:         plexus-containers-component-metadata
 Requires:         modello
 Requires:         maven-release-plugin
@@ -45,7 +45,8 @@ This is a shared POM parent for FuseSource Maven projects
 
 %prep
 %setup -q
-%patch0 -p1
+%pom_remove_plugin :clirr-maven-plugin
+cp -p %{SOURCE1} LICENSE
 
 %install
 # POM
@@ -56,10 +57,15 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom
 
 %files
+%doc LICENSE
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %changelog
+* Tue Sep  4 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.5-5
+- Install LICENSE file
+- Convert patch to POM macro
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 40f75fa..cf03184 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 61b43bcbd9d2d3c5a5484ec8454c513a  fusesource-pom-1.5.tar.bz2
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt


More information about the scm-commits mailing list