Accepting request 45298 from Archiving

Copy from Archiving/zlib based on submit request 45298 from user elvigia OBS-URL: https://build.opensuse.org/request/show/45298 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=19
2010-08-13 21:57:54 +00:00 · 2010-08-13 21:57:54 +00:00 · f2140951f9
commit f2140951f9
parent 7b8bdec5f7
10 changed files with 70 additions and 249 deletions
--- a/zlib-1.2.1-CFLAGS.dif
+++ b/zlib-1.2.1-CFLAGS.dif
@ -1,13 +0,0 @@
-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"
-  SFLAGS=${CFLAGS-"-fPIC -O3"}
-+  SFLAGS="-fPIC "${CFLAGS-"-O3"}
-   CFLAGS="$cflags"
-   case `(uname -s || echo unknown) 2>/dev/null` in
-   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
--- a/zlib-1.2.1-make-test.patch
+++ b/zlib-1.2.1-make-test.patch
@ -1,25 +0,0 @@
-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 || \
-	  echo '		*** minigzip test FAILED ***' ; \
-+	ret=0; \
-+	if ! echo hello world | ./minigzip | ./minigzip -d; then \
-+	  echo '		*** minigzip test FAILED ***'; ret=1; \
-+	fi; \
- 	if ./example; then \
- 	  echo '		*** zlib test OK ***'; \
- 	else \
-	  echo '		*** zlib test FAILED ***'; \
-	fi
-+	  echo '		*** zlib test FAILED ***'; ret=1; \
-+	fi; \
-+	exit $$ret
- 
- libz.a: $(OBJS) $(OBJA)
- 	$(AR) $@ $(OBJS) $(OBJA)
--- a/zlib-1.2.1-vsnprintf.patch
+++ b/zlib-1.2.1-vsnprintf.patch
@ -1,44 +0,0 @@
-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
-+#error
-     (void)vsprintf(buf, format, va);
-     va_end(va);
-     for (len = 0; len < sizeof(buf); len++)
-         if (buf[len] == 0) break;
- #  else
-+#error
-     len = vsprintf(buf, format, va);
-     va_end(va);
- #  endif
- #else
- #  ifdef HAS_vsnprintf_void
-+#error
-     (void)vsnprintf(buf, sizeof(buf), format, va);
-     va_end(va);
-     len = strlen(buf);
-@@ -647,16 +650,19 @@ int ZEXPORTVA gzprintf (file, format, a1
-     buf[sizeof(buf) - 1] = 0;
- #ifdef NO_snprintf
- #  ifdef HAS_sprintf_void
-+#error
-     sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-     for (len = 0; len < sizeof(buf); len++)
-         if (buf[len] == 0) break;
- #  else
-+#error
-     len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
- #  endif
- #else
- #  ifdef HAS_snprintf_void
-+#error
-     snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-     len = strlen(buf);
--- a/zlib-1.2.2-format.patch
+++ b/zlib-1.2.2-format.patch
@ -1,18 +1,17 @@
 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.h.orig
+++ zlib.h
+@@ -1256,7 +1256,11 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile f
+    error.
 */
 
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-+
-+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...)) 
+-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...))
 +#ifdef __GNUC__
-+	__attribute__((__format__(__printf__,2,3)))
+       __attribute__((__format__(__printf__,2,3)))
 +#endif
 +;
 /*
-      Converts, formats, and writes the args to the compressed file under
-    control of the format string, as in fprintf. gzprintf returns the number of
+      Converts, formats, and writes the arguments to the compressed file under
+    control of the format string, as in fprintf.  gzprintf returns the number of
--- a/zlib-1.2.3-686.patch
+++ b/zlib-1.2.3-686.patch
@ -1,58 +0,0 @@
-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
- * Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
-+/* match.S -- x86 assembly version of the zlib longest_match() function.
-+ * Optimized for the Intel 686 chips (PPro and later).
-  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License.
-+ * Copyright (C) 1998, 2007 Brian Raiter <breadbox@muppetlabs.com>
-+ *
-+ * This software is provided 'as-is', without any express or implied
-+ * warranty.  In no event will the author be held liable for any damages
-+ * arising from the use of this software.
-+ *
-+ * Permission is granted to anyone to use this software for any purpose,
-+ * including commercial applications, and to alter it and redistribute it
-+ * freely, subject to the following restrictions:
-+ *
-+ * 1. The origin of this software must not be misrepresented; you must not
-+ *    claim that you wrote the original software. If you use this software
-+ *    in a product, an acknowledgment in the product documentation would be
-+ *    appreciated but is not required.
-+ * 2. Altered source versions must be plainly marked as such, and must not be
-+ *    misrepresented as being the original software.
-+ * 3. This notice may not be removed or altered from any source distribution.
-  */
- 
- #ifndef NO_UNDERLINE
-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
-+
-+
-+Update:
-+
-+I've been ignoring these assembly routines for years, believing that
-+gcc's generated code had caught up with it sometime around gcc 2.95
-+and the major rearchitecting of the Pentium 4. However, I recently
-+learned that, despite what I believed, this code still has some life
-+in it. On the Pentium 4 and AMD64 chips, it continues to run about 8%
-+faster than the code produced by gcc 4.1.
-+
-+In acknowledgement of its continuing usefulness, I've altered the
-+license to match that of the rest of zlib. Share and Enjoy!
-+
-+Brian Raiter
-+breadbox@muppetlabs.com
-+April, 2007
--- a/zlib-1.2.3-visibility-support.patch
+++ b/zlib-1.2.3-visibility-support.patch
@ -1,49 +0,0 @@
-Only export symbols that should be exported.
-
-Patch by Mike Frysinger
-
-http://bugs.gentoo.org/32764
-http://bugs.gentoo.org/149929
-
-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
-+int foo __attribute__ ((visibility ("hidden")));
-+int main()
-+{
-+  return 0;
-+}
-+EOF
-+if ($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>/dev/null; then
-+  CFLAGS="$CFLAGS -DHAS_attribute_visibility -fvisibility=hidden"
-+  echo "Checking for attribute(visibility) support... Yes."
-+else
-+  echo "Checking for attribute(visibility) support... No."
-+fi
-+
-+cat > $test.c <<EOF
- #include <stdio.h>
- #include <stdarg.h>
- #include "zconf.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
- 
- #ifndef ZEXTERN
-#  define ZEXTERN extern
-+#  if defined(ZLIB_INTERNAL) && defined(HAS_attribute_visibility)
-+#    define ZEXTERN extern __attribute__ ((visibility("default")))
-+#  else
-+#    define ZEXTERN extern
-+#  endif
- #endif
- #ifndef ZEXPORT
- #  define ZEXPORT
--- a/zlib-1.2.3.tar.bz2
+++ b/zlib-1.2.3.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-size 425209
--- a/zlib-1.2.5.tar.bz2
+++ b/zlib-1.2.5.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94e7564a74e24859a27c1d41d24fb9998356b2d3b659cd4810455c5e6668854b
+size 486372
--- a/zlib.changes
+++ b/zlib.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Tue Aug 10 16:04:54 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 1.2.5:
+  + fixes bugs in gzseek() and gzeof()
+- Changes from version 1.2.4:
+  + Fixed bugs in adler32_combine(), compressBound(), and
+    deflateBound()
+  + Wholesale replacement of gz* functions with faster versions
+  + As part of that, added gzbuffer(), gzoffset(), gzclose_r(), and
+    gzclose_w() functions
+  + Faster Z_HUFFMAN_ONLY and Z_RLE compression for images and
+    other specialized compression
+  + Added flush options Z_BLOCK to deflate() and Z_TREES to
+    inflate() for finer control
+  + Added inflateReset2() and inflateMark() functions, the latter
+    to aid in random access applications
+  + Added LFS (Large File Summit) support for 64-bit file offsets
+    and many other portability improvements
+  + Updated examples in examples/ and updated third-party
+    contributions in contrib/ 
+- Drop obsolete patches:
+  + zlib-1.2.1-make-test.patch
+  + zlib-1.2.1-vsnprintf.patch
+  + zlib-1.2.1-CFLAGS.dif
+  + zlib-1.2.3-686.patch
+  + zlib-1.2.3-visibility-support.patch
+- Rebased zlib-1.2.2-format.patch
+- Clean spec file using spec-cleaner.
+- BuildRequire to have proper pkgconfig() provides.
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

--- a/zlib.spec
+++ b/zlib.spec
@ -1,5 +1,5 @@
 #
-# spec file for package zlib (Version 1.2.3)
+# spec file for package zlib (Version 1.2.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild


 Name:           zlib
@ -23,27 +22,22 @@ License:        Other uncritical OpenSource License
 Group:          System/Libraries
 Provides:       libz
 Obsoletes:      libz
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      zlib-64bit
 %endif
 #
-Version:        1.2.3
-Release:        142
+Version:        1.2.5
+Release:        1
 Summary:        Data Compression Library
+Url:            http://www.zlib.net/
 Source:         zlib-%{version}.tar.bz2
 Source1:        LICENSE
 Source2:        baselibs.conf
-Patch:          zlib-1.2.1-make-test.patch
-Patch1:         zlib-1.2.1-vsnprintf.patch
-Patch2:         zlib-1.2.1-CFLAGS.dif
-Patch3:         zlib-1.2.2-format.patch
-Patch4:         zlib-1.2.3-visibility-support.patch
-#PATCH-FIX-UPSTREAM patch from Brian Raiter, update only license text of contrib file (#490107)
-Patch5:         zlib-1.2.3-686.patch
-Url:            http://www.zlib.net/
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
+Patch0:         zlib-1.2.2-format.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig

 %description
 ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
@ -51,20 +45,13 @@ ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
 also available in other formats from
 ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html.

-
-
-Authors:
--------
-    Rob Hooft <hooft@EMBL-Heidelberg.DE>
-    Michael Mauldin <mlm@cs.cmu.edu>
-
 %package devel
 License:        Other uncritical OpenSource License
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Languages/C and C++
+Requires:       glibc-devel
+Requires:       zlib = %{version}
 Provides:       libz:/usr/include/zlib.h
-Requires:       zlib = %{version} glibc-devel
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      zlib-devel-64bit
@ -76,53 +63,45 @@ This package contains all necessary include files and libraries needed
 to develop applications that require the provided includes and
 libraries.

-
-
 %package devel-static
 License:        Other uncritical OpenSource License
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Languages/C and C++
-Provides:       %{name}-devel:%{_libdir}/libz.a
 Requires:       %{name}-devel = %{version}
+Provides:       %{name}-devel:%{_libdir}/libz.a

 %description devel-static
 This package contains all necessary include files and libraries needed
 to develop applications that require the provided includes and
 libraries.

-
-
 %prep
 %setup -q
-%patch
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
+%patch0

 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --shared
+CFLAGS="%{optflags}" ./configure --shared
 %{__make} %{?_smp_mflags}

 %check
 make test

 %install
-mkdir -p $RPM_BUILD_ROOT/{%_lib,%_libdir}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p %{buildroot}{/%{_lib},%{_libdir}}
+mkdir -p %{buildroot}%{_mandir}/man3
+mkdir -p %{buildroot}%{_includedir}
 make install \
-	prefix=$RPM_BUILD_ROOT/%{_prefix} \
-	libdir=$RPM_BUILD_ROOT/%{_lib}
+	prefix=%{buildroot}%{_prefix} \
+	libdir=%{buildroot}/%{_lib}
 %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so
 %{__rm} -v %{buildroot}/%{_lib}/libz.so
 # static lib
-make libz.a
-install -m 644 libz.a $RPM_BUILD_ROOT/%{_libdir}
+mv %{buildroot}/%{_lib}/libz.a %{buildroot}%{_libdir}
+# Move .pc file to %{_libdir}
+mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
 # manpage
-install -m 644 zlib.3 $RPM_BUILD_ROOT/%{_mandir}/man3
-install -m 644 zutil.h $RPM_BUILD_ROOT%{_includedir}
+install -m 644 zlib.3 %{buildroot}%{_mandir}/man3
+install -m 644 zutil.h %{buildroot}%{_includedir}

 %clean
 rm -rf %{buildroot}
@ -138,12 +117,13 @@ rm -rf %{buildroot}

 %files devel
 %defattr(-,root,root)
-%doc README ChangeLog algorithm.txt
+%doc README ChangeLog
 %doc %{_mandir}/man3/zlib.3.gz
-/usr/include/zlib.h
-/usr/include/zconf.h
-/usr/include/zutil.h
+%{_includedir}/zlib.h
+%{_includedir}/zconf.h
+%{_includedir}/zutil.h
 %{_libdir}/libz.so
+%{_libdir}/pkgconfig/zlib.pc

 %files devel-static
 %defattr(-,root,root)