auto-import changelog data from perl-5.8.5-3.src.rpm

5.8.5-2
- fix conflicting file when building on x86_64 and i386
This commit is contained in:
cvsdist 2004-09-09 10:10:53 +00:00
parent e8eca54538
commit a763abccc2
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,27 @@
This patch fixes perlbug so that it doesn't contain the exact build
time in the script. This allows the script to be shared on multiple
arches and not generate an RPM conflicts.
--- perl-5.8.4/utils/perlbug.PL.notag 2004-08-23 10:44:45.822726077 -0400
+++ perl-5.8.4/utils/perlbug.PL 2004-08-23 10:46:40.155237161 -0400
@@ -64,7 +64,7 @@
eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
if \$running_under_some_shell;
-my \$config_tag1 = '$extract_version - $Config{cf_time}';
+my \$config_tag1 = '$extract_version';
my \$patchlevel_date = $patchlevel_date;
my \$patch_tags = '$patch_tags';
@@ -598,9 +598,8 @@
print OUT <<EFF;
---
EFF
- print OUT "This perlbug was built using Perl $config_tag1\n",
- "It is being executed now by Perl $config_tag2.\n\n"
- if $config_tag2 ne $config_tag1;
+ print OUT "This perlbug was built using Perl $config_tag1 in the Red Hat build system.\n",
+ "It is being executed now by Perl $config_tag2.\n\n";
print OUT <<EOF;
Site configuration information for perl $perl_version:

View File

@ -5,7 +5,7 @@
%define multilib_64_archs x86_64 s390x ppc64 sparc64 %define multilib_64_archs x86_64 s390x ppc64 sparc64
%define perlver 5.8.5 %define perlver 5.8.5
%define perlrel 2 %define perlrel 3
%define perlepoch 3 %define perlepoch 3
Provides: perl(:WITH_PERLIO) Provides: perl(:WITH_PERLIO)
@ -56,6 +56,7 @@ Patch9: perl-5.7.3-syslog.patch
# Patch10: perl-5.8.0-notty.patch # Patch10: perl-5.8.0-notty.patch
Patch11: perl-5.8.3-fullinc.patch Patch11: perl-5.8.3-fullinc.patch
Patch12: perl-5.8.5-incpush.patch Patch12: perl-5.8.5-incpush.patch
Patch13: perl-5.8.3-perlbug-tag.patch
%define __perl_requires %{SOURCE11} %define __perl_requires %{SOURCE11}
@ -201,6 +202,7 @@ more secure running of setuid perl scripts.
# %%patch8 -p1 # %%patch8 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1
%patch17 -p1 %patch17 -p1
@ -387,6 +389,9 @@ find $RPM_BUILD_ROOT%{_libdir}/perl* -name .packlist -o -name perllocal.pod | \
%endif %endif
%changelog %changelog
* Mon Aug 23 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-2
- fix conflicting file when building on x86_64 and i386
* Sat Jul 24 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-1 * Sat Jul 24 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-1
- add Provides: Carp::Heavy to fix new dep error (bz 128507) - add Provides: Carp::Heavy to fix new dep error (bz 128507)