From b086e34c36eb14cf916d793c9dc6c2badf08176e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 15 Feb 2013 15:33:49 +0100
Subject: [PATCH] Update to upstream version 0.12.0

- Implement new pom macros: xpath_replace and xpath_set
- Remove Support-local-depmaps.patch (accepted upstream)
---
 .gitignore                       |  1 +
 0001-Support-local-depmaps.patch | 32 --------------------------------
 javapackages-tools.spec          | 11 +++++++----
 sources                          |  2 +-
 4 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 0001-Support-local-depmaps.patch

diff --git a/.gitignore b/.gitignore
index 1b25cf6..98d6e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /javapackages-0.11.0.tar.xz
 /javapackages-0.11.1.tar.xz
 /javapackages-0.11.2.tar.xz
+/javapackages-0.12.0.tar.xz
diff --git a/0001-Support-local-depmaps.patch b/0001-Support-local-depmaps.patch
deleted file mode 100644
index 0d081a7..0000000
--- a/0001-Support-local-depmaps.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6f84d5f5b66ac69cc356a0c8a7bdd4d51b70d196 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Fri, 15 Feb 2013 13:53:42 +0100
-Subject: [PATCH] Support local depmaps
-
----
- scripts/mvn-rpmbuild | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/scripts/mvn-rpmbuild b/scripts/mvn-rpmbuild
-index 9659c3c..39a0c9e 100755
---- a/scripts/mvn-rpmbuild
-+++ b/scripts/mvn-rpmbuild
-@@ -40,6 +40,15 @@ export TYCHO_MVN_RPMBUILD=true
- unset TYCHO_MVN_LOCAL
- export TYCHO_MVN_LOCAL
- 
-+# Support local depmaps
-+XMVN_RESOLV_DEPMAPS=,
-+for arg in "$@"; do
-+    if egrep -q '^-Dmaven\.local\.depmap\.file=' <<<"$arg"; then
-+	XMVN_RESOLV_DEPMAPS="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
-+    fi
-+done
-+export XMVN_RESOLV_DEPMAPS
-+
- # Install maven metadata for plugins in groups org.apache.maven.plugins
- # and org.codehaus.mojo. This is to allow plugins in these groups to be
- # used without giving groupId prefix.
--- 
-1.8.1.2
-
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 364a071..7952cd9 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,12 +1,11 @@
 Name:           javapackages-tools
-Version:        0.11.2
-Release:        6%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
-Patch0001:      0001-Support-local-depmaps.patch
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -53,7 +52,6 @@ This package provides macros and scripts to support packaging Maven artifacts.
 
 %prep
 %setup -q -n javapackages-%{version}
-%patch1 -p1
 
 %build
 
@@ -123,6 +121,11 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
 
 
 %changelog
+* Fri Feb 15 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.12.0-1
+- Update to upstream version 0.12.0
+- Implement new pom macros: xpath_replace and xpath_set
+- Remove Support-local-depmaps.patch (accepted upstream)
+
 * Fri Feb 15 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.11.2-6
 - Support local depmaps
 
diff --git a/sources b/sources
index 8262987..ee462d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa0099101803abf782a8a7fd533a2ce6  javapackages-0.11.2.tar.xz
+cde8c06d1287abb4fa2877a12f09cfed  javapackages-0.12.0.tar.xz