rpms/mod_perl/devel mod_perl-2.0.4-multilib.patch, NONE, 1.1 mod_perl.spec, 1.64, 1.65 mod_perl-2.0.2-multilib.patch, 1.1, NONE
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Wed Aug 6 11:29:39 UTC 2008
- Previous message (by thread): rpms/ptrash/F-8 import.log, NONE, 1.1 ptrash.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/logwatch/devel logwatch-7.3.6-cron5.patch, NONE, 1.1 logwatch.spec, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17228
Modified Files:
mod_perl.spec
Added Files:
mod_perl-2.0.4-multilib.patch
Removed Files:
mod_perl-2.0.2-multilib.patch
Log Message:
* Wed Aug 6 2008 Joe Orton <jorton at redhat.com> 2.0.4-5
- rebuild to fix patch fuzz (#427758)
mod_perl-2.0.4-multilib.patch:
--- NEW FILE mod_perl-2.0.4-multilib.patch ---
Generate the XS typemap files in sorted order; ensures that the
devel package contents do not differe across multilib platforms.
--- mod_perl-2.0.4/lib/ModPerl/TypeMap.pm.multilib
+++ mod_perl-2.0.4/lib/ModPerl/TypeMap.pm
@@ -442,12 +442,12 @@ sub typedefs_code {
$code .= qq{\#include "$_"\n}
}
- for my $t (@{ $self->{struct} }) {
+ for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{struct} }) {
next if $seen{ $t->[1] }++;
$code .= "typedef $t->[0] * $t->[1];\n";
}
- for my $t (@{ $self->{typedef} }) {
+ for my $t (sort {$a->[1] cmp $b->[1]} @{ $self->{typedef} }) {
next if $seen{ $t->[1] }++;
$code .= "typedef $t->[0] $t->[1];\n";
}
@@ -470,7 +470,9 @@ sub sv_convert_code {
my %seen;
my $code = "";
- while (my ($ctype, $ptype) = each %$map) {
+ for my $ctype (sort keys %$map) {
+ my $ptype = $map->{$ctype};
+
next if $self->special($ptype);
next if $ctype =~ /\s/;
my $class = $ptype;
Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mod_perl.spec 14 Jul 2008 10:54:21 -0000 1.64
+++ mod_perl.spec 6 Aug 2008 11:29:09 -0000 1.65
@@ -2,7 +2,7 @@
Name: mod_perl
Version: 2.0.4
-Release: 4
+Release: 5
Summary: An embedded Perl interpreter for the Apache HTTP Server
Group: System Environment/Daemons
@@ -12,7 +12,7 @@
Source1: perl.conf
Source2: filter-requires.sh
Source3: filter-provides.sh
-Patch0: mod_perl-2.0.2-multilib.patch
+Patch0: mod_perl-2.0.4-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl-devel, perl(ExtUtils::Embed)
@@ -127,6 +127,9 @@
%{_includedir}/httpd/*
%changelog
+* Wed Aug 6 2008 Joe Orton <jorton at redhat.com> 2.0.4-5
+- rebuild to fix patch fuzz (#427758)
+
* Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 2.0.4-4
- rebuild for new BDB
--- mod_perl-2.0.2-multilib.patch DELETED ---
- Previous message (by thread): rpms/ptrash/F-8 import.log, NONE, 1.1 ptrash.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/logwatch/devel logwatch-7.3.6-cron5.patch, NONE, 1.1 logwatch.spec, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list