[redhat-rpm-config] Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433
Toshio くらとみ
toshio at fedoraproject.org
Wed Oct 3 17:17:18 UTC 2012
commit 94fba4eae862419217de90102977daa052d5f026
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Oct 3 10:17:07 2012 -0700
Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433
to fix spaces in files and directories that are fed to the
brp-python-hardlink script
...9.1.0-python-hardlink-spaces-in-filenames.patch | 15 +++++++++++++++
redhat-rpm-config.spec | 7 +++++++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch b/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
new file mode 100644
index 0000000..d724b21
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
@@ -0,0 +1,15 @@
+diff --git a/brp-python-hardlink b/brp-python-hardlink
+index a937529..210d69c 100755
+--- a/brp-python-hardlink
++++ b/brp-python-hardlink
+@@ -10,8 +10,8 @@ fi
+ find "$RPM_BUILD_ROOT" -type f -name "*.pyc" | while read pyc ; do
+ pyo="$(echo $pyc | sed -e 's/.pyc$/.pyo/')"
+ if [ -f "$pyo" ] ; then
+- csha="$(sha1sum -b $pyc | cut -d' ' -f 1)" && \
+- osha="$(sha1sum -b $pyo | cut -d' ' -f 1)" && \
++ csha="$(sha1sum -b "$pyc" | cut -d' ' -f 1)" && \
++ osha="$(sha1sum -b "$pyo" | cut -d' ' -f 1)" && \
+ if [ "$csha" = "$osha" ] ; then
+ ln -f "$pyc" "$pyo"
+ fi
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 1af0ba6..e9fd236 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -31,6 +31,7 @@ Patch7: redhat-rpm-config-9.1.0-hardened.patch
Patch8: redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch
Patch9: redhat-rpm-config-9.1.0-dwz.patch
Patch10: redhat-rpm-config-9.1.0-minidebuginfo.patch
+Patch11: redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch
BuildArch: noarch
Requires: coreutils
Requires: perl-srpm-macros
@@ -54,6 +55,7 @@ Red Hat specific rpm configuration files.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
@@ -75,6 +77,11 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/*
%changelog
+* Wed Oct 3 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 9.1.0-33
+- Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433
+ to fix spaces in files and directories that are fed to the
+ brp-python-hardlink script
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.1.0-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list