- redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars

whose filenames contain spaces. (#461854)
This commit is contained in:
Adam Jackson 2009-08-12 17:47:31 +00:00
parent b8c8815624
commit b25d4df599
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
--- /usr/lib/rpm/redhat/brp-java-repack-jars.orig 2009-04-20 09:56:37.000000000 -0600
+++ /usr/lib/rpm/redhat/brp-java-repack-jars 2009-04-20 10:01:14.000000000 -0600
@@ -38,8 +38,8 @@
rm -f $j
# Create the directories first.
- for d in `find -type d | LC_ALL=C sort`; do
- mkdir -p $JARDIR/$d
+ find -type d | LC_ALL=C sort | while read d; do
+ mkdir -p "$JARDIR/$d"
done
# Get the modtime from the newest ChangeLog. If the project
@@ -64,14 +64,14 @@
# move the contents over to the a new directory in order and set
# the times.
- for f in `find -type f | LC_ALL=C sort`; do
- cp $f $JARDIR/$f
- touch --date="$DATE" $JARDIR/$f
+ find -type f | LC_ALL=C sort | while read f; do
+ cp "$f" "$JARDIR/$f"
+ touch --date="$DATE" "$JARDIR/$f"
done
popd > /dev/null
# Set the times of the directories.
- touch --date="$DATE" `find $JARDIR -type d`
+ find $JARDIR -type d -print0 | xargs -0 touch --date="$DATE"
# make the jar
pushd $JARDIR > /dev/null

View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 9.0.3
Release: 13%{?dist}
Release: 14%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@ -13,6 +13,7 @@ Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch
Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
Patch6: redhat-rpm-config-9.0.3-xz-payload.patch
Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
BuildArch: noarch
Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root
@ -29,6 +30,7 @@ Red Hat specific rpm configuration files.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p5
%install
make DESTDIR=${RPM_BUILD_ROOT} install
@ -41,6 +43,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
* Wed Aug 12 2009 Adam Jackson <ajax@redhat.com> 9.0.3-14
- redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars
whose filenames contain spaces. (#461854)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.0.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild