From 5ccbe011b74005dc9a674afc6e71bfe6b080c077 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 18 2013 13:46:50 +0000
Subject: Update to upstream version 2.0.0


Full list of changes:
  http://lists.fedoraproject.org/pipermail/java-devel/2013-July/004863.html

---

diff --git a/.gitignore b/.gitignore
index 9c85c5f..0408b85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
 /javapackages-0.14.0.tar.xz
 /javapackages-0.14.1.tar.xz
 /javapackages-0.15.0.tar.xz
+/javapackages-2.0.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 762a6fd..bc55f90 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
-Version:        0.15.0
-Release:        2%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
@@ -10,11 +10,13 @@ BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
 
+Requires:       coreutils
 Requires:       libxslt
+Requires:       lua
 Requires:       python
 
-Requires:       jpackage-utils
-Conflicts:      jpackage-utils < 1.7.5-17
+Provides:       jpackage-utils = %{version}-%{release}
+Obsoletes:      jpackage-utils < %{version}-%{release}
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -61,68 +63,32 @@ This package provides macros and scripts to support packaging Maven artifacts.
 %setup -q -n javapackages-%{version}
 
 %build
+%configure
+./build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-utils
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/maven
-install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven-effective-poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/xmvn
-install -d -m 755 $RPM_BUILD_ROOT%{_mavendepmapfragdir}
-
-install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/maven.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/javadoc.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-# Add the maven poms file attribute entry (rpm >= 4.9.0)
-install -p -m 644 depgenerators/fileattrs/maven.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 depgenerators/fileattrs/osgi.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 depgenerators/fileattrs/javadoc.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-
-install -p -m 644 macros.* $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -p -m 644 metadata/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/maven
-install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
-install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
-install -p -m 644 scripts/xmvn_config_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
-install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
-
-install -p -m 644 configs/configuration*.xml $RPM_BUILD_ROOT%{_datadir}/xmvn
-ln -sf %{_datadir}/xmvn/configuration-19.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml
-
-install -p -m 755 depmap.xml $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name}-depmap.xml
-
-# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild
-# scripts as they are already provided by maven package.
-%if 0%{?fedora} == 18
-rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
-%endif
-
-
-%files
+./install
+sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
+
+
+%files -f files-common
 %doc LICENSE
-%dir %{_rpmconfigdir}/fileattrs
-%dir %{_datadir}/maven-effective-poms
-%{_rpmconfigdir}/fileattrs/*.attr
-%{_rpmconfigdir}/*.prov
-%{_rpmconfigdir}/*.req
-# The python file is compiled producing .pyc and .pyo, which we need to include
-%{_javadir}-utils/maven_depmap.py*
-%{_javadir}-utils/pom_editor.sh
-%{_sysconfdir}/rpm/macros.fjava
-%{_mavendepmapfragdir}/*
-
-%files -n maven-local
-%{_javadir}-utils/xmvn_config_editor.sh
-%{_sysconfdir}/rpm/macros.xmvn
-%{_sysconfdir}/maven/*.xml
-%{_bindir}/mvn-*
-%{_datadir}/xmvn/configuration*.xml
+
+%files -n maven-local -f files-maven
 
 
 %changelog
+* Thu Jul 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-1
+- Update to upstream version 2.0.0
+- Merge functionality of jpackage-utils
+- Provide and obsolete jpackage-utils
+- %%add_maven_depmap macro now injects pom.properties to every JAR
+- %%add_to_maven_depmap and %%update_maven_depmap macros were removed
+- maven2jpp-mapdeps.xsl template has been removed
+- Macros related to installation of icons and desktop files were removed
+- 14 new manual pages were added
+- Documentation specific to JPackage was removed
+
 * Mon Jul  1 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.15.0-2
 - Add R: jvnet-parent
 
diff --git a/sources b/sources
index 4a13a09..60dc35e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-966efa0d5e09058cae9c5fbaba6842ff  javapackages-0.15.0.tar.xz
+b1b5353e86fa699baa6f5d83401df587  javapackages-2.0.0.tar.xz