Attachment 637242 Details for Bug 872737 – Candidate patch to fix the problem

[patch] Candidate patch to fix the problem

brp-java-repack-jars.patch (text/plain), 2.18 KB, created by Jerry James on 2012-11-02 20:44:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jerry James

Created: 2012-11-02 20:44:46 UTC

Size: 2.18 KB

patch

obsolete

>--- brp-java-repack-jars.orig	2010-02-02 02:24:04.000000000 -0700
>+++ brp-java-repack-jars	2012-11-02 14:40:14.716003965 -0600
>@@ -1,4 +1,4 @@
>-#!/bin/sh
>+#!/bin/bash
> 
> # If using normal root, avoid changing anything.
> if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
>@@ -13,8 +13,12 @@
> 	exit 0
> fi
> 
>-JARS=`find $RPM_BUILD_ROOT -type f -name \*.jar -not -size 0`
>-if [ ! -z "$JARS" ]; then 
>+declare -a JARS
>+declare -i i
>+while IFS= read -r -u3 -d $'\0' file; do
>+  JARS[i++]="$file";
>+done 3< <(find $RPM_BUILD_ROOT -type f -name \*.jar -not -size 0 -print0)
>+if [ ${#JARS[@]} -gt 0 ]; then
> 	
> 	# make $RPM_BUILD_ROOT/tmp if it doesn't exist
> 	rmtmp=0
>@@ -25,17 +29,18 @@
> 	
> 	# unpack every jar, set the date of the files and directories and 
> 	# repack the jar
>-	for j in $JARS ; do
>-		JARNAME=`basename $j`
>-		JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.tmpdir.XXXXXXXXXX` || exit 1
>-		JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.jardir.XXXXXXXXXX` || exit 1
>-		TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp $JARNAME.timeref.XXXXXXXXXX` || exit 1
>+	for ((i = 0; i < ${#JARS[@]}; i++)); do
>+		j="${JARS[i]}"
>+		JARNAME=`basename "$j"`
>+		JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1
>+		JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1
>+		TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp "$JARNAME.timeref.XXXXXXXXXX"` || exit 1
> 		
>-		pushd $JTMPDIR > /dev/null
>-		/usr/bin/unzip -qq -o $j
>+		pushd "$JTMPDIR" > /dev/null
>+		/usr/bin/unzip -qq -o "$j"
> 		find -type d -exec chmod a+rx {} \;
> 		find -type f -exec chmod a+r {} \;
>-		rm -f $j
>+		rm -f "$j"
> 		
> 		# Create the directories first.
> 		find -type d | LC_ALL=C sort | while read d; do
>@@ -76,20 +81,20 @@
> 		done
> 
> 		# make the jar
>-		pushd $JARDIR > /dev/null
>+		pushd "$JARDIR" > /dev/null
> 
> 		if [ -n "`find -not -name '.'`" ]; then
> 			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -q -X -9 $j -@
> 		else
> 			# Put the empty jar back
>-			touch $j
>+			touch "$j"
> 		fi
> 		popd > /dev/null
> 
> 		# Cleanup.
>-		rm -rf $JTMPDIR
>-		rm -rf $JARDIR
>-		rm -f $TIMEREF
>+		rm -rf "$JTMPDIR"
>+		rm -rf "$JARDIR"
>+		rm -f "$TIMEREF"
> 	done
> 
> 	# remove $RPM_BUILD_ROOT/tmp if we created it

Actions: View | Diff

Attachments on bug 872737: 637242 | 641786