From 4d062a4f529effb7ade77fff00cf6a4b278b7eeb Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Feb 27 2013 14:56:36 +0000
Subject: Merge branch 'forge-parent-31'


Conflicts:
	forge-parent.spec

---

diff --git a/forge-parent.spec b/forge-parent.spec
index f549a02..d3b5480 100644
--- a/forge-parent.spec
+++ b/forge-parent.spec
@@ -1,66 +1,43 @@
 Name:           forge-parent
-Version:        5
-Release:        9%{?dist}
+Version:        31
+Release:        1%{?dist}
 Summary:        Sonatype Forge Parent Pom
-
-Group:          Development/Libraries
-#Note: The license is confirmed at:
-#http://nexus.sonatype.org/mailing-list-dev-archives.html#nabble-ts28522017
 License:        ASL 2.0
-#svn export http://svn.sonatype.org/forge/tags/forge-parent-5 forge-parent
-URL:            http://svn.sonatype.org/forge/tags/forge-parent-5
-
-# tar czf forge-parent-5.tgz forge-parent
-Source0:        forge-parent-5.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: jpackage-utils
-BuildRequires: java
-BuildRequires: java-devel
-
-Requires: jpackage-utils
+URL:            https://docs.sonatype.org/display/FORGE/Index
+Source0:        http://repo1.maven.org/maven2/org/sonatype/forge/%{name}/%{version}/%{name}-%{version}.pom
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+BuildArch:      noarch
+BuildRequires:  maven-local
 
 %description
 Sonatype Forge is an open-source community dedicated to the creation of the 
 next-generation of development tools and technologies.
 
 %prep
-%setup -q -n %{name}
+%setup -qcT
+cp -p %{SOURCE0} pom.xml
+cp -p %{SOURCE1} LICENSE
+# We don't have nexus-staging-maven-plugin in Fedora
+%pom_remove_plugin :nexus-staging-maven-plugin
 
 %build
-#nothing to do for the pom
+%mvn_build
 
 %install
-rm -rf %{buildroot}/
-
-%add_to_maven_depmap org.sonatype.forge forge-parent %{version} JPP forge-parent
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%post
-%update_maven_depmap
+%mvn_install
 
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%doc LICENSE
 
 %changelog
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
+* Mon Jan 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 31-1
+- Update to upstream version 31
+- Install missing LICENSE file
+- Build with xmvn
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -87,6 +64,3 @@ rm -rf %{buildroot}
 
 * Wed May 12 2010 Weinan Li <weli@redhat.com> - 5-1
 - Initial version
-
-
-
diff --git a/sources b/sources
index 0512953..cb82bad 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b638dbac217f133bddbf80e836829cc8  forge-parent-5.tgz
+d11282c3cef93ec01ff461ce5ed66c8f  forge-parent-31.pom
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt