[javapackages-tools] Fix TypeError in maven_depmap (see: rhbz#1191657)

Michal Srb msrb at fedoraproject.org
Mon Feb 16 13:39:04 UTC 2015


commit 0680d4153503632809f1d18c917358cccd14e2fc
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Feb 16 14:38:43 2015 +0100

    Fix TypeError in maven_depmap (see: rhbz#1191657)

 .gitignore                                         |    1 +
 ...around-for-XMvn-version-bump-rhbz-1191657.patch | 1860 --------------------
 ...map-Open-existing-metadata-in-binary-mode.patch |   25 -
 ...t-Fix-TypeError-process_raw_request-got-a.patch |   85 -
 ...-dashes-with-dots-in-versioned-provides-a.patch |  112 --
 0003-Add-compatibility-with-lua-5.3.0.patch        |   37 -
 javapackages-tools.spec                            |   16 +-
 sources                                            |    2 +-
 8 files changed, 4 insertions(+), 2134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16cb761..d5ef7e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
 /javapackages-4.3.0.tar.xz
 /javapackages-4.3.1.tar.xz
 /javapackages-4.3.2.tar.xz
+/javapackages-4.4.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index dc3ff98..c10af60 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -8,20 +8,14 @@
 %endif
 
 Name:           javapackages-tools
-Version:        4.3.2
-Release:        6%{?dist}
+Version:        4.4.0
+Release:        0%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
 URL:            https://git.fedorahosted.org/git/javapackages.git
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
-Patch0:         0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
-Patch1:         0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch
-Patch2:         0003-Add-compatibility-with-lua-5.3.0.patch
-# XXX temporary workaround
-Patch3:         0001-Workaround-for-XMvn-version-bump-rhbz-1191657.patch
-Patch4:         0001-maven_depmap-Open-existing-metadata-in-binary-mode.patch
 
 BuildArch:      noarch
 
@@ -180,12 +174,6 @@ This package provides non-essential macros and scripts to support Java packaging
 %prep
 %setup -q -n javapackages-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
 %build
 %if 0%{?with_python3}
 %configure --pyinterpreter=%{__python3}
diff --git a/sources b/sources
index e22be2c..57a8c51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d1ef162f04e546a0c58d745f2896d3c  javapackages-4.3.2.tar.xz
+e4e84b14946df1188b526ab5d721071d  javapackages-4.4.0.tar.xz


More information about the scm-commits mailing list