packages: ImageMagick/ImageMagick.spec, perl/perl-PerlIO.patch, perl/perl-h...

amateja amateja at pld-linux.org
Thu Aug 27 08:50:13 CEST 2009 

Author: amateja                      Date: Thu Aug 27 06:50:13 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 6.5.5-3

---- Files affected:
packages/ImageMagick:
   ImageMagick.spec (1.307 -> 1.308) 
packages/perl:
   perl-PerlIO.patch (1.1 -> 1.2) , perl-h2ph-includes.patch (1.1 -> 1.2) , perl-t-syslog.patch (1.1 -> 1.2) , perl-timer-test.patch (1.2 -> 1.3) , perl-write-permissions.patch (1.2 -> 1.3) , perl.spec (1.417 -> 1.418) , perl_581-noroot_install.patch (1.1 -> 1.2) , perl_581-soname.patch (1.4 -> 1.5) , perl_585-microperl_uconfig.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/ImageMagick/ImageMagick.spec
diff -u packages/ImageMagick/ImageMagick.spec:1.307 packages/ImageMagick/ImageMagick.spec:1.308
--- packages/ImageMagick/ImageMagick.spec:1.307	Wed Aug 26 09:07:52 2009
+++ packages/ImageMagick/ImageMagick.spec	Thu Aug 27 08:50:08 2009
@@ -12,7 +12,7 @@
 #
 %include	/usr/lib/rpm/macros.perl
 %define		ver 6.5.5
-%define		pver	2
+%define		pver	3
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -30,7 +30,7 @@
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5:	666a8dd70e20de81dbc8e5ec775e2743
+# Source0-md5:	2435951dac6e658e927a8f076d64b1d7
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
@@ -1055,6 +1055,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.308  2009/08/27 06:50:08  amateja
+- updated to 6.5.5-3
+
 Revision 1.307  2009/08/26 07:07:52  amateja
 - updated to 6.5.5-2
 

================================================================
Index: packages/perl/perl-PerlIO.patch
diff -u packages/perl/perl-PerlIO.patch:1.1 packages/perl/perl-PerlIO.patch:1.2
--- packages/perl/perl-PerlIO.patch:1.1	Sun Aug 10 00:37:26 2008
+++ packages/perl/perl-PerlIO.patch	Thu Aug 27 08:50:08 2009
@@ -1,6 +1,6 @@
 diff -ur perl-5.10.0.org/ext/PerlIO/via/via.xs perl-5.10.0/ext/PerlIO/via/via.xs
---- perl-5.10.0.org/ext/PerlIO/via/via.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/PerlIO/via/via.xs	2008-08-10 00:35:51.367506014 +0200
+--- perl-5.10.0.org/ext/PerlIO-via/via.xs	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/PerlIO-via/via.xs	2008-08-10 00:35:51.367506014 +0200
 @@ -89,7 +89,7 @@
  	    if (!s->fh) {
  		GV *gv = newGVgen(HvNAME_get(s->stash));

================================================================
Index: packages/perl/perl-h2ph-includes.patch
diff -u packages/perl/perl-h2ph-includes.patch:1.1 packages/perl/perl-h2ph-includes.patch:1.2
--- packages/perl/perl-h2ph-includes.patch:1.1	Sun Feb 10 14:14:01 2008
+++ packages/perl/perl-h2ph-includes.patch	Thu Aug 27 08:50:08 2009
@@ -1,6 +1,6 @@
---- perl-5.10.0/utils/h2ph.PL.orig	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/utils/h2ph.PL	2008-02-10 14:01:47.206525485 +0100
-@@ -717,6 +717,7 @@
+--- perl-5.10.1/utils/h2ph.PL.orig	2009-08-25 10:14:50.000000000 +0200
++++ perl-5.10.1/utils/h2ph.PL	2009-08-25 10:23:00.000000000 +0200
+@@ -722,6 +722,7 @@
  
      return if ($file eq "-");
  
@@ -8,12 +8,14 @@
      open HEADER, $file or return;
          while (defined($line = <HEADER>)) {
              while (/\\$/) { # Handle continuation lines
-@@ -726,6 +727,8 @@
- 
-             if ($line =~ /^#\s*include\s+<(.*?)>/) {
-                 push(@ARGV, $1) unless $Is_converted{$1};
+@@ -736,7 +737,9 @@
+                     $new_file = "$1/$new_file";
+                 }
+                 push(@ARGV, $new_file) unless $Is_converted{$new_file};
+-            }
 +            } elsif ($line =~ /^#\s*include\s+\"(.*?)\"/) {
-+                push(@ARGV, $filedir . $1) unless $Is_converted{$filedir . $1};
-             }
++		    push(@ARGV, $filedir . $new_file) unless $Is_converted{$filedir . $new_file};
++	    }
          }
      close HEADER;
+ }

================================================================
Index: packages/perl/perl-t-syslog.patch
diff -u packages/perl/perl-t-syslog.patch:1.1 packages/perl/perl-t-syslog.patch:1.2
--- packages/perl/perl-t-syslog.patch:1.1	Tue Feb 26 08:32:15 2008
+++ packages/perl/perl-t-syslog.patch	Thu Aug 27 08:50:08 2009
@@ -1,15 +1,15 @@
---- perl-5.10.0/ext/Sys/Syslog/t/syslog.t~	2008-02-26 07:24:29.000000000 +0000
-+++ perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2008-02-26 07:24:34.000000000 +0000
-@@ -201,7 +201,11 @@
+--- perl-5.10.1/ext/Sys-Syslog/t/syslog.t.orig	2009-08-25 10:25:36.000000000 +0200
++++ perl-5.10.1/ext/Sys-Syslog/t/syslog.t	2009-08-25 10:27:58.000000000 +0200
+@@ -213,7 +213,11 @@
          }
      }
      else  {
 -        ok( $r, "setlogsock() should return true: '$r'" );
-+		if (-r "/dev/log") {
-+			ok( $r, "setlogsock() should return true: '$r'" );
-+		} else {
-+			ok( !$r, "setlogsock() should return false: '$r'" );
-+        }
++	    if (-r "/dev/log") {
++                    ok( $r, "setlogsock() should return true: '$r'" );
++            } else {
++                    ok( !$r, "setlogsock() should return false: '$r'" );
++	    }
      }
  
      # setlogsock() with "stream" and an empty path

================================================================
Index: packages/perl/perl-timer-test.patch
diff -u packages/perl/perl-timer-test.patch:1.2 packages/perl/perl-timer-test.patch:1.3
--- packages/perl/perl-timer-test.patch:1.2	Wed Jan  9 14:43:35 2008
+++ packages/perl/perl-timer-test.patch	Thu Aug 27 08:50:08 2009
@@ -1,5 +1,5 @@
---- perl-5.8.8/ext/Time/HiRes/t/HiRes.t~	2005-12-17 20:20:26.000000000 +0100
-+++ perl-5.8.8/ext/Time/HiRes/t/HiRes.t	2007-02-11 00:06:42.000000000 +0100
+--- perl-5.10.1/ext/Time-HiRes/t/HiRes.t.orig	2005-12-17 20:20:26.000000000 +0100
++++ perl-5.10.1/ext/Time-HiRes/t/HiRes.t	2007-02-11 00:06:42.000000000 +0100
 @@ -113,7 +113,7 @@
  # completes fine with (say) 30% slosh, and fail otherwise.  If you do that,
  # consider changing over to test.pl at the same time.

================================================================
Index: packages/perl/perl-write-permissions.patch
diff -u packages/perl/perl-write-permissions.patch:1.2 packages/perl/perl-write-permissions.patch:1.3
--- packages/perl/perl-write-permissions.patch:1.2	Wed Jan  9 14:40:11 2008
+++ packages/perl/perl-write-permissions.patch	Thu Aug 27 08:50:08 2009
@@ -1,15 +1,15 @@
---- ExtUtils-MakeMaker-6.30.orig/lib/ExtUtils/Install.pm	2005-03-22 04:30:24.000000000 +0000
-+++ ExtUtils-MakeMaker-6.30.write-permissions/lib/ExtUtils/Install.pm	2006-10-30 16:14:28.000000000 +0000
-@@ -666,7 +666,7 @@
-             utime($atime,$mtime + $Is_VMS,$targetfile) unless $nonono>1;
+--- perl-5.10.1/lib/ExtUtils/Install.pm.orig	2009-08-25 08:46:26.000000000 +0200
++++ perl-5.10.1/lib/ExtUtils/Install.pm	2009-08-25 08:48:05.000000000 +0200
+@@ -813,7 +813,7 @@
+                 utime($atime,$mtime + $Is_VMS,$targetfile) unless $dry_run>1;
  
  
--            $mode = 0444 | ( $mode & 0111 ? 0111 : 0 );
-+            $mode = 0644 | ( $mode & 0111 ? 0111 : 0 );
-             $mode = $mode | 0222
-                 if $realtarget ne $targetfile;
-             _chmod( $mode, $targetfile, $verbose );
-@@ -1018,7 +1018,7 @@
+-                $mode = 0444 | ( $mode & 0111 ? 0111 : 0 );
++                $mode = 0644 | ( $mode & 0111 ? 0111 : 0 );
+                 $mode = $mode | 0222
+                     if $realtarget ne $targetfile;
+                 _chmod( $mode, $targetfile, $verbose );
+@@ -1215,7 +1215,7 @@
          }
          my($mode,$atime,$mtime) = (stat $from)[2,8,9];
          utime($atime,$mtime+$Is_VMS,$to);
@@ -18,4 +18,3 @@
          next unless $from =~ /\.pm$/;
          _autosplit($to,$autodir);
      }
-

================================================================
Index: packages/perl/perl.spec
diff -u packages/perl/perl.spec:1.417 packages/perl/perl.spec:1.418
--- packages/perl/perl.spec:1.417	Tue Jul 14 17:50:48 2009
+++ packages/perl/perl.spec	Thu Aug 27 08:50:08 2009
@@ -29,7 +29,7 @@
 # NOTE
 # - modules in 5.10.0: http://search.cpan.org/~rgarcia/perl-5.10.0/
 
-%define		abi	5.10.0
+%define		abi	5.10.1
 %define		perlthread	%{?with_threads:-thread-multi}
 
 %define		perl_privlib	%{_datadir}/perl5/%{ver}
@@ -43,8 +43,8 @@
 %define		perl_modver()		%([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{print $3}' %{SOURCE3} || echo ERROR)
 %define		perl_modversion()	%([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{m=$1; gsub(/::/, "-", m); printf("perl-%s = %s\\n", m, $3)}END{if (!m) printf("# Error looking up [%s]\\n", p)}' %{SOURCE3} || echo ERROR)
 
-%define		ver	5.10.0
-%define		rel	20
+%define		ver	5.10.1
+%define		rel	1
 Summary:	Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):	Programovací jazyk Perl
 Summary(da.UTF-8):	Programmeringssproget Perl
@@ -73,7 +73,7 @@
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://www.cpan.org/src/%{name}-%{ver}.tar.gz
-# Source0-md5:	d2c39b002ebfd2c3c5dba589365c5a71
+# Source0-md5:	b9b2fdb957f50ada62d73f43ee75d044
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	de47d7893f49ad7f41ba69c78511c0db
 Source2:	%{name}.prov
@@ -88,9 +88,9 @@
 Patch7:		%{name}-timer-test.patch
 Patch8:		%{name}-h2ph-includes.patch
 Patch9:		%{name}-t-syslog.patch
-Patch10:	%{name}-PerlIO.patch
-Patch11:	%{name}-attribute_error.patch
-Patch12:	%{name}-parameter_passing.patch
+#Patch10:	%{name}-ListUtil.patch
+#Patch11:	%{name}-attribute_error.patch
+#Patch12:	%{name}-parameter_passing.patch
 URL:		http://dev.perl.org/perl5/
 %ifarch ppc
 # gcc 3.3.x miscompiles pp_hot.c
@@ -661,9 +661,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+#%patch10 -p1
+#%patch11 -p1
+#%patch12 -p1
 
 %build
 
@@ -701,14 +701,14 @@
 
 ## {Scalar,List}::Util should be in perl_archlib (it's a bit tricky and should
 ## probably be done in %%prep, but then Configure would complain (->MANIFEST))
-mv ext/List/Util/lib/List/Util.pm ext/List/Util
-%{__rm} ext/List/Util/Makefile.PL
-cat <<'EOF' > ext/List/Util/Makefile.PL
+mv ext/List-Util/lib/List/Util.pm ext/List-Util
+%{__rm} ext/List-Util/Makefile.PL
+cat <<'EOF' > ext/List-Util/Makefile.PL
 use ExtUtils::MakeMaker;
 WriteMakefile(NAME=>"List::Util", VERSION_FROM=>"Util.pm", DEFINE=>"-DPERL_EXT");
 EOF
 
-%{__make} \
+%{__make} -j1 \
 	LIBPERL_SONAME=libperl.so.%{abi} \
 	LDDLFLAGS="%{rpmcflags} -shared"
 
@@ -723,7 +723,7 @@
 ## microperl
 %if %{with microperl}
 %{__rm} uconfig.h
-%{__make} -f Makefile.micro \
+%{__make} -j1 -f Makefile.micro \
 	archlib=%{perl_archlib} \
 	archlibexp=%{perl_archlib} \
 	privlib=%{perl_privlib} \
@@ -1491,6 +1491,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.418  2009/08/27 06:50:08  amateja
+- updated to 6.5.5-3
+
 Revision 1.417  2009/07/14 15:50:48  radek
 - release 20: added -parameter_passing.patch (fixes a performance regression)
 - NOTE: make test currently broken because of tar

================================================================
Index: packages/perl/perl_581-noroot_install.patch
diff -u packages/perl/perl_581-noroot_install.patch:1.1 packages/perl/perl_581-noroot_install.patch:1.2
--- packages/perl/perl_581-noroot_install.patch:1.1	Fri Aug 22 19:37:56 2003
+++ packages/perl/perl_581-noroot_install.patch	Thu Aug 27 08:50:08 2009
@@ -4,8 +4,8 @@
  
  # Do some quick sanity checks.
  
--if (!$nonono && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
-+#if (!$nonono && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
+-if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
++#if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
  
     $installbin		|| die "No installbin directory in config.sh\n";
  -d $installbin		|| mkpath($installbin, $verbose, 0777);

================================================================
Index: packages/perl/perl_581-soname.patch
diff -u packages/perl/perl_581-soname.patch:1.4 packages/perl/perl_581-soname.patch:1.5
--- packages/perl/perl_581-soname.patch:1.4	Thu Jan 10 01:17:46 2008
+++ packages/perl/perl_581-soname.patch	Thu Aug 27 08:50:08 2009
@@ -1,6 +1,6 @@
---- perl-5.10.0/Makefile.SH.orig	2008-01-09 21:37:11.870736307 +0000
-+++ perl-5.10.0/Makefile.SH	2008-01-09 22:47:51.579350787 +0000
-@@ -124,7 +124,7 @@
+--- perl-5.10.1/Makefile.SH.orig	2009-08-25 08:26:10.000000000 +0200
++++ perl-5.10.0/Makefile.SH	2009-08-25 08:32:41.000000000 +0200
+@@ -160,7 +160,7 @@
  	    # INSTALL file, under "Building a shared perl library".
  	    # If there is no pre-existing $libperl, we don't need
  	    # to do anything further.
@@ -9,7 +9,7 @@
  		rm -f preload
  		cat <<'EOT' > preload
  #! /bin/sh
-@@ -135,7 +135,7 @@
+@@ -171,7 +171,7 @@
  EOT
  		chmod 755 preload
  		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
@@ -18,19 +18,19 @@
  	    ;;
  	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
  		;;
-@@ -581,14 +581,16 @@
- Makefile: $Makefile_s
- !GROK!THIS!
- else
--	$spitshell >>Makefile <<'!NO!SUBS!'
+@@ -728,14 +728,16 @@
+ !NO!SUBS!
+ 		;;
+     esac
+-	$spitshell >>$Makefile <<'!NO!SUBS!'
 -$(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
-+	$spitshell >>Makefile <<!NO!SUBS!
++	$spitshell >>$Makefile <<!NO!SUBS!
 +LIBPERL_SONAME=\$(LIBPERL).$version
 +\$(LIBPERL): \$& \$(obj) \$(DYNALOADER) \$(LIBPERLEXPORT)
  !NO!SUBS!
  	case "$useshrplib" in
  	true)
- 		$spitshell >>Makefile <<'!NO!SUBS!'
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
 -	rm -f $@
 -	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
 +	rm -f $@ $(LIBPERL_SONAME)

================================================================
Index: packages/perl/perl_585-microperl_uconfig.patch
diff -u packages/perl/perl_585-microperl_uconfig.patch:1.5 packages/perl/perl_585-microperl_uconfig.patch:1.6
--- packages/perl/perl_585-microperl_uconfig.patch:1.5	Wed Jan  9 14:32:34 2008
+++ packages/perl/perl_585-microperl_uconfig.patch	Thu Aug 27 08:50:08 2009
@@ -25,15 +25,14 @@
  
  # Do not regenerate perly.c and perly.h.
  
-diff -urN perl-5.10.0.org/uconfig.sh perl-5.10.0/uconfig.sh
---- perl-5.10.0.org/uconfig.sh	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/uconfig.sh	2008-01-09 14:21:01.327533497 +0100
+--- perl-5.10.1/uconfig.sh.orig	2009-08-25 08:37:36.000000000 +0200
++++ perl-5.10.1/uconfig.sh	2009-08-25 08:43:07.000000000 +0200
 @@ -5,12 +5,7 @@
  afsroot='/afs'
  alignbytes='4'
  aphostname='/bin/hostname'
--archlib='/usr/local/lib/perl5/5.10/unknown'
--archlibexp='/usr/local/lib/perl5/5.10/unknown'
+-archlib='/usr/local/lib/perl5/5.11/unknown'
+-archlibexp='/usr/local/lib/perl5/5.11/unknown'
 -archname='unknown'
  asctime_r_proto='0'
 -bin='/usr/local/bin'
@@ -47,19 +46,19 @@
  d_alarm='undef'
 -d_archlib='undef'
 +d_archlib='define'
+ d_asctime64='undef'
  d_asctime_r='undef'
  d_atolf='undef'
- d_atoll='undef'
-@@ -221,7 +216,7 @@
+@@ -232,7 +227,7 @@
  d_libm_lib_version='undef'
  d_link='undef'
- d_localtime_r='undef'
+ d_localtime64='undef'
 -d_localtime_r_needs_tzset='undef'
 +d_localtime_r_needs_tzset='define'
+ d_localtime_r='undef'
  d_locconv='undef'
  d_lockf='undef'
- d_longdbl='undef'
-@@ -639,14 +634,10 @@
+@@ -661,14 +656,10 @@
  old_pthread_create_joinable=''
  optimize='-O2'
  orderlib='false'
@@ -69,13 +68,13 @@
  package='perl5'
  phostname='hostname'
  pidtype=int
--privlib='/usr/local/lib/perl5/5.10'
--privlibexp='/usr/local/lib/perl5/5.10'
+-privlib='/usr/local/lib/perl5/5.11'
+-privlibexp='/usr/local/lib/perl5/5.11'
  procselfexe=''
  prototype='undef'
  ptrsize='4'
-@@ -673,8 +664,6 @@
- sPRIx64='"Lx"'
+@@ -699,8 +690,6 @@
+ sPRIXU64='"LX"'
  sSCNfldbl='"llf"'
  sched_yield='sched_yield()'
 -scriptdir='/usr/local/bin'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick.spec?r1=1.307&r2=1.308&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-PerlIO.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-h2ph-includes.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-t-syslog.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-timer-test.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-write-permissions.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl.spec?r1=1.417&r2=1.418&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl_581-noroot_install.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl_581-soname.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl_585-microperl_uconfig.patch?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list