94c3f755ba
to fix spaces in files and directories that are fed to the brp-python-hardlink script - Require zip since java repack jars requires it https://bugzilla.redhat.com/show_bug.cgi?id=857479 - Java jars need the MANIFEST.MF file to be first in the archive https://bugzilla.redhat.com/show_bug.cgi?id=465664 - Fix kernel_source macro to match the directory that kernel sources are installed in https://bugzilla.redhat.com/show_bug.cgi?id=648996 - Patch _mandir, _infodir, and _defaultocdir to use _prefix https://bugzilla.redhat.com/show_bug.cgi?id=853216
17 lines
641 B
Diff
17 lines
641 B
Diff
Index: redhat-rpm-config-9.1.0/brp-java-repack-jars
|
|
===================================================================
|
|
--- redhat-rpm-config-9.1.0.orig/brp-java-repack-jars
|
|
+++ redhat-rpm-config-9.1.0/brp-java-repack-jars
|
|
@@ -79,7 +79,10 @@ if [ ! -z "$JARS" ]; then
|
|
pushd $JARDIR > /dev/null
|
|
|
|
if [ -n "`find -not -name '.'`" ]; then
|
|
- find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -q -X -9 $j -@
|
|
+ if [ -e META-INF/MANIFEST.MF ]; then
|
|
+ /usr/bin/zip -q -X -9 $j META-INF/MANIFEST.MF
|
|
+ fi
|
|
+ find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 $j -@
|
|
else
|
|
# Put the empty jar back
|
|
touch $j
|