On 07/12/12 21:31, Andrew Ford wrote:
[snip]
Found a couple of other missing scl macros - patch follows
A corrected patch follows. The previous patch had a couple of typos
that I had corrected in the spec file after I made the patch - namely
macros enclosed or terminated with parentheses rather than braces. I
only noticed when I applied the patch to another source tree. rpmbuild
didn't complain but either silently exited or segfaulted.
%global perl_arch_stem -thread-multi
%global perl_archname %{_arch}-%{_os}%{perl_arch_stem}
+%global debug_package %{nil}
+
%global multilib_64_archs x86_64 s390x ppc64 sparc64
%global parallel_tests 1
%global tapsetdir %{_datadir}/systemtap/tapset
@@ -116,7 +118,7 @@
BuildRequires: db4-devel, groff, tcsh, zlib-devel, bzip2-devel,
systemtap-sdt-devel
%{?scl:BuildRequires: %{scl}-runtime}
BuildRequires: gdbm-devel
-BuildRequires: perl516-build
+%{?scl:BuildRequires: %{scl}-build}
# For tests
BuildRequires: procps, rsyslog
@@ -128,7 +130,7 @@
%if %{rebuild_from_scratch}
Provides: %{?scl_prefix}perl(:MODULE_COMPAT_5.10.1)
%endif
-Provides: perl(:MODULE_COMPAT_5.16.1)
+Provides: %{?scl_prefix}perl(:MODULE_COMPAT_5.16.1)
# scl provide for biding to meta package
Provides: %{?scl_prefix}perl
@@ -590,7 +592,7 @@
Version: 1.61
Requires: %{?scl_prefix}perl-devel
Requires: %{?scl_prefix}perl =
%{perl_epoch}:%{perl_version}-%{release}
-Requires: perl(File::Path)
+Requires: %{?scl_prefix}perl(File::Path)
BuildArch: noarch
%description ExtUtils-Manifest