commit zlib for openSUSE:Factory

26 Nov 2009

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Fri Nov 27 00:53:59 CET 2009.



--------

--- zlib/zlib.changes	2009-05-11 10:45:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes	2009-11-24 17:24:27.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 24 16:23:32 UTC 2009 - crrodriguez@opensuse.org
+
+- refresh patches with fuzz=0 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zlib.spec ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -19,7 +19,7 @@
 
 
 Name:           zlib
-License:        zlib/libpng License; zlib license. See http://zlib.net/zlib_license.html
+License:        Zlib ; zlib license. See http://zlib.net/zlib_license.html
 Group:          System/Libraries
 Provides:       libz
 Obsoletes:      libz
@@ -30,7 +30,7 @@
 %endif
 #
 Version:        1.2.3
-Release:        139
+Release:        140
 Summary:        Data Compression Library
 Source:         zlib-%{version}.tar.bz2
 Source1:        LICENSE
@@ -93,12 +93,12 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch
 %patch1
 %patch2
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch3
+%patch4
+%patch5
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --shared

++++++ zlib-1.2.1-CFLAGS.dif ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -1,6 +1,8 @@
---- configure
-+++ configure	2003/11/21 14:06:46
-@@ -69,7 +69,7 @@
+Index: configure
+===================================================================
+--- configure.orig	2005-07-11 22:11:57.000000000 +0200
++++ configure	2009-11-24 17:22:26.143484000 +0100
+@@ -73,7 +73,7 @@ esac
  
  if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
    CC="$cc"
@@ -8,4 +10,4 @@
 +  SFLAGS="-fPIC "${CFLAGS-"-O3"}
    CFLAGS="$cflags"
    case `(uname -s || echo unknown) 2>/dev/null` in
-   Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
+   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;

++++++ zlib-1.2.1-make-test.patch ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -1,7 +1,9 @@
---- zlib-1.1.4/Makefile.in.jj	Mon Mar 11 08:58:30 2002
-+++ zlib-1.1.4/Makefile.in	Fri Apr 26 06:53:12 2002
-@@ -62,13 +62,16 @@ all: example minigzip
- 
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig	2005-07-18 04:25:21.000000000 +0200
++++ Makefile.in	2009-11-24 17:22:25.561564000 +0100
+@@ -59,13 +59,16 @@ all: example$(EXE) minigzip$(EXE)
+ check: test
  test: all
  	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
 -	echo hello world | ./minigzip | ./minigzip -d || \

++++++ zlib-1.2.1-vsnprintf.patch ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -1,6 +1,8 @@
---- gzio.c
-+++ gzio.c
-@@ -606,16 +606,19 @@
+Index: gzio.c
+===================================================================
+--- gzio.c.orig	2005-07-11 22:31:48.000000000 +0200
++++ gzio.c	2009-11-24 17:22:25.927568000 +0100
+@@ -610,16 +610,19 @@ int ZEXPORTVA gzprintf (gzFile file, con
      va_start(va, format);
  #ifdef NO_vsnprintf
  #  ifdef HAS_vsprintf_void
@@ -20,7 +22,7 @@
      (void)vsnprintf(buf, sizeof(buf), format, va);
      va_end(va);
      len = strlen(buf);
-@@ -643,16 +646,19 @@
+@@ -647,16 +650,19 @@ int ZEXPORTVA gzprintf (file, format, a1
      buf[sizeof(buf) - 1] = 0;
  #ifdef NO_snprintf
  #  ifdef HAS_sprintf_void

++++++ zlib-1.2.2-format.patch ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -1,6 +1,8 @@
---- zlib-1.2.2/zlib.h.xx	2005-02-23 12:52:02.889385975 +0100
-+++ zlib-1.2.2/zlib.h	2005-02-23 12:55:14.227599948 +0100
-@@ -986,7 +986,12 @@
+Index: zlib.h
+===================================================================
+--- zlib.h.orig	2005-07-18 04:26:49.000000000 +0200
++++ zlib.h	2009-11-24 17:22:26.357480000 +0100
+@@ -1119,7 +1119,12 @@ ZEXTERN int ZEXPORT    gzwrite OF((gzFil
     (0 in case of error).
  */
  

++++++ zlib-1.2.3-686.patch ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -1,6 +1,7 @@
-diff -uNr zlib-1.2.3/contrib/asm686/match.S zlib-1.2.3-686/contrib/asm686/match.S
---- zlib-1.2.3/contrib/asm686/match.S	2005-07-12 11:08:20.000000000 -0700
-+++ zlib-1.2.3-686/contrib/asm686/match.S	2007-04-10 22:48:15.000000000 -0700
+Index: contrib/asm686/match.S
+===================================================================
+--- contrib/asm686/match.S.orig	2005-07-12 20:08:20.000000000 +0200
++++ contrib/asm686/match.S	2009-11-24 17:22:26.833478000 +0100
 @@ -1,9 +1,23 @@
 -/* match.s -- Pentium-Pro-optimized version of longest_match()
 - * Written for zlib 1.1.2
@@ -30,10 +31,11 @@
   */
  
  #ifndef NO_UNDERLINE
-diff -uNr zlib-1.2.3/contrib/asm686/README.686 zlib-1.2.3-686/contrib/asm686/README.686
---- zlib-1.2.3/contrib/asm686/README.686	1998-06-19 07:47:27.000000000 -0700
-+++ zlib-1.2.3-686/contrib/asm686/README.686	2007-04-10 22:33:54.000000000 -0700
-@@ -32,3 +32,20 @@
+Index: contrib/asm686/README.686
+===================================================================
+--- contrib/asm686/README.686.orig	1998-06-19 16:47:27.000000000 +0200
++++ contrib/asm686/README.686	2009-11-24 17:22:26.838475000 +0100
+@@ -32,3 +32,20 @@ then do:
  
  CFLAGS="-O3 -DASMV" ./configure
  make OBJA=match.o

++++++ zlib-1.2.3-visibility-support.patch ++++++
--- /var/tmp/diff_new_pack.26ZoJJ/_old	2009-11-27 00:53:29.000000000 +0100
+++ /var/tmp/diff_new_pack.26ZoJJ/_new	2009-11-27 00:53:29.000000000 +0100
@@ -5,9 +5,11 @@
 http://bugs.gentoo.org/32764
 http://bugs.gentoo.org/149929
 
---- zlib-1.2.3/configure
-+++ zlib-1.2.3/configure
-@@ -209,6 +209,20 @@
+Index: configure
+===================================================================
+--- configure.orig	2009-11-24 17:22:26.143484000 +0100
++++ configure	2009-11-24 17:22:26.578476000 +0100
+@@ -204,6 +204,20 @@ else
  fi
  
  cat > $test.c <<EOF
@@ -28,8 +30,10 @@
  #include <stdio.h>
  #include <stdarg.h>
  #include "zconf.h"
---- zlib-1.2.3/zconf.in.h
-+++ zlib-1.2.3/zconf.in.h
+Index: zconf.in.h
+===================================================================
+--- zconf.in.h.orig	2005-05-28 08:40:35.000000000 +0200
++++ zconf.in.h	2009-11-24 17:22:26.582476000 +0100
 @@ -244,7 +244,11 @@
  #endif
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)