rpms/perl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix multilib conflict again, DEVEL

Browse Source
This commit is contained in:
cturner 2004-10-05 16:11:00 +00:00
parent e5063204cc
commit 81e214dcbb
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
perl-5.8.3-perlbug-tag.patch
View File

@ -1,19 +1,44 @@
This patch fixes perlbug so that it doesn't contain the exact build --- perl-5.8.0/utils/perlbug.PL.perlbug 2004-10-05 12:07:54.423998839 -0400
time in the script. This allows the script to be shared on multiple +++ perl-5.8.0/utils/perlbug.PL 2004-10-05 12:08:37.607393368 -0400
arches and not generate an RPM conflicts. @@ -27,8 +27,6 @@
open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
--- perl-5.8.4/utils/perlbug.PL.notag 2004-08-23 10:44:45.822726077 -0400 or die "Can't open patchlevel.h: $!";
+++ perl-5.8.4/utils/perlbug.PL 2004-08-23 10:46:40.155237161 -0400
@@ -64,7 +64,7 @@ -my $patchlevel_date = (stat PATCH_LEVEL)[9];
-
while (<PATCH_LEVEL>) {
last if $_ =~ /^\s*static\s+char.*?local_patches\[\]\s*=\s*{\s*$/;
}
@@ -64,9 +62,8 @@
eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
if \$running_under_some_shell; if \$running_under_some_shell;
-my \$config_tag1 = '$extract_version - $Config{cf_time}'; -my \$config_tag1 = '$extract_version - $Config{cf_time}';
+my \$config_tag1 = '$extract_version'; +my \$config_tag1 = '$extract_version';
my \$patchlevel_date = $patchlevel_date; -my \$patchlevel_date = $patchlevel_date;
my \$patch_tags = '$patch_tags'; my \$patch_tags = '$patch_tags';
@@ -598,9 +598,8 @@ my \@patches = (
$patch_desc
@@ -275,17 +272,6 @@
$ok = 0;
if ($::opt_o) {
if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
- my $age = time - $patchlevel_date;
- if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
- my $date = localtime $patchlevel_date;
- print <<"EOF";
-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
-are more than 60 days old. This Perl version was constructed on
-$date. If you really want to report this, use
-"perlbug -okay" or "perlbug -nokay".
-EOF
- exit();
- }
# force these options
unless ($::opt_n) {
$::opt_S = 1; # don't prompt for send
@@ -592,9 +578,8 @@
print OUT <<EFF; print OUT <<EFF;
--- ---
EFF EFF

5
perl.spec
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 6 %define perlrel 7
%define perlepoch 3 %define perlepoch 3
Provides: perl(:WITH_PERLIO) Provides: perl(:WITH_PERLIO)
@ -391,6 +391,9 @@ find $RPM_BUILD_ROOT%{_libdir}/perl* -name .packlist -o -name perllocal.pod | \
%endif %endif
%changelog %changelog
* Tue Oct 5 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-7
- update perlbug patch to strip build date as well
* Mon Aug 23 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-2 * Mon Aug 23 2004 Chip Turner <cturner@redhat.com> 3:5.8.5-2
- fix conflicting file when building on x86_64 and i386 - fix conflicting file when building on x86_64 and i386