[javapackages-tools] Update patch for ZIP files
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Jan 7 22:31:02 UTC 2014
commit 723c43768efe3af5f85a34292d2abacf0271264d
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Jan 7 23:24:40 2014 +0100
Update patch for ZIP files
0001-Allow-ZIP-files-in-usr-share-java.patch | 51 ++++++++++----------------
javapackages-tools.spec | 7 +++-
2 files changed, 25 insertions(+), 33 deletions(-)
---
diff --git a/0001-Allow-ZIP-files-in-usr-share-java.patch b/0001-Allow-ZIP-files-in-usr-share-java.patch
index 3b47afe..ac6aec6 100644
--- a/0001-Allow-ZIP-files-in-usr-share-java.patch
+++ b/0001-Allow-ZIP-files-in-usr-share-java.patch
@@ -1,57 +1,46 @@
-From 61c9ae9b76c821bc05ddfadfd8d897a2d050afe4 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk at redhat.com>
-Date: Tue, 7 Jan 2014 18:39:35 +0100
-Subject: [PATCH] Allow ZIP files in /usr/share/java
-
-Maybe /usr/share/java is not the best place to store ZIP files, but
-packages are doing so anyways and allowing ZIPs here simplifies
-packaging.
----
- configs/configuration-20-rpmbuild-raw.xml | 1 +
- configs/configuration-20-rpmbuild.xml | 1 +
- configs/configuration-20.xml | 5 +++++
- 3 files changed, 7 insertions(+)
-
diff --git a/configs/configuration-20-rpmbuild-raw.xml b/configs/configuration-20-rpmbuild-raw.xml
-index 472b55b..8cfedb4 100644
+index 472b55b..eb99908 100644
--- a/configs/configuration-20-rpmbuild-raw.xml
+++ b/configs/configuration-20-rpmbuild-raw.xml
-@@ -30,6 +30,7 @@
+@@ -30,6 +30,9 @@
<stereotypes>
<stereotype>
<extension>jar</extension>
++ <stereotype>
++ </stereotype>
+ <extension>zip</extension>
</stereotype>
</stereotypes>
</repository>
diff --git a/configs/configuration-20-rpmbuild.xml b/configs/configuration-20-rpmbuild.xml
-index c6b91bd..6f8e3b8 100644
+index c6b91bd..5ecb4ba 100644
--- a/configs/configuration-20-rpmbuild.xml
+++ b/configs/configuration-20-rpmbuild.xml
-@@ -42,6 +42,7 @@
- <stereotypes>
+@@ -43,6 +43,9 @@
<stereotype>
<extension>jar</extension>
-+ <extension>zip</extension>
</stereotype>
++ <stereotype>
++ <extension>zip</extension>
++ </stereotype>
</stereotypes>
</repository>
+ <repository>
diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml
-index 883d6b1..1dbff14 100644
+index 883d6b1..1186b46 100644
--- a/configs/configuration-20.xml
+++ b/configs/configuration-20.xml
-@@ -75,6 +75,11 @@
- <stereotypes>
+@@ -76,6 +76,13 @@
<stereotype>
<extension>jar</extension>
-+ <!-- Maybe /usr/share/java is not the best place to store
-+ ZIP files, but packages are doing so anyways and
-+ allowing ZIPs here simplifies packaging. TODO: find a
-+ better location for ZIP files. -->
-+ <extension>zip</extension>
</stereotype>
++ <!-- Maybe /usr/share/java is not the best place to store
++ ZIP files, but packages are doing so anyways and
++ allowing ZIPs here simplifies packaging. TODO: find a
++ better location for ZIP files. -->
++ <stereotype>
++ <extension>zip</extension>
++ </stereotype>
</stereotypes>
</repository>
---
-1.8.4.2
-
+ <repository>
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 33f808e..bd20caa 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 3.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -8,7 +8,7 @@ License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
-# Backported from upstream commit 61c9ae9
+# Backported from upstream commits 61c9ae9 and 322ef52
Patch0: 0001-Allow-ZIP-files-in-usr-share-java.patch
BuildArch: noarch
@@ -134,6 +134,9 @@ popd
%changelog
+* Tue Jan 7 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.4.2-3
+- Update patch for ZIP files
+
* Tue Jan 7 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.4.2-2
- Allow ZIP files in %{_javadir}
More information about the scm-commits
mailing list