From 15fbd4c0c225d4775b09f0cfa47d2f9920d1aa39 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 5 Jul 2013 13:29:16 +0300
Subject: [PATCH] - fix brp-java-repack-jars failing on strange permissions
 (#905573)

---
 redhat-rpm-config-9.1.0-jar-repack-perms.patch | 14 ++++++++++++++
 redhat-rpm-config.spec                         |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 redhat-rpm-config-9.1.0-jar-repack-perms.patch

diff --git a/redhat-rpm-config-9.1.0-jar-repack-perms.patch b/redhat-rpm-config-9.1.0-jar-repack-perms.patch
new file mode 100644
index 0000000..4268526
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-jar-repack-perms.patch
@@ -0,0 +1,14 @@
+diff -up redhat-rpm-config-9.1.0/brp-java-repack-jars.jar-repack-perms redhat-rpm-config-9.1.0/brp-java-repack-jars
+--- redhat-rpm-config-9.1.0/brp-java-repack-jars.jar-repack-perms	2013-07-05 13:21:56.548998671 +0300
++++ redhat-rpm-config-9.1.0/brp-java-repack-jars	2013-07-05 13:22:50.962398381 +0300
+@@ -35,8 +35,8 @@ if [ ! -z "$JARS" ]; then
+ 		
+ 		pushd "$JTMPDIR" > /dev/null
+ 		/usr/bin/unzip -qq -o "$j"
+-		find -type d -exec chmod a+rx {} \;
+-		find -type f -exec chmod a+r {} \;
++		find -type d -exec chmod a+rx,u+w {} \;
++		find -type f -exec chmod a+r,u+w {} \;
+ 		rm -f "$j"
+ 		
+ 		# Create the directories first.
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index af45423..477c07a 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 47%{?dist}
+Release: 48%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -58,6 +58,8 @@ Patch21: redhat-rpm-config-9.1.0-fcflags.patch
 Patch22: redhat-rpm-config-9.1.0-ncpus-max.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=978763
 Patch23: redhat-rpm-config-9.1.0-stackprotector-strong.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=905573
+Patch24: redhat-rpm-config-9.1.0-jar-repack-perms.patch
 BuildArch: noarch
 Requires: coreutils
 Requires: perl-srpm-macros
@@ -95,6 +97,7 @@ Red Hat specific rpm configuration files.
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 
@@ -116,6 +119,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Fri Jul 05 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-48
+- fix brp-java-repack-jars failing on strange permissions (#905573)
+
 * Thu Jul 04 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-47
 - switch from -fstack-protector to -fstack-protector-strong (#978763)