From 06d5e8a374afbdbdffb166c60809e79cb1c5cd87c440c16a7c7ec018b6b9ca49 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 10 Apr 2008 11:15:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=6

---
 baselibs.conf |  3 ++
 zlib.changes  |  6 ++++
 zlib.spec     | 91 +++++++++++++++++++++++++++------------------------
 3 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 baselibs.conf

diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..073f53d
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,3 @@
+zlib
+  targettype x86 provides "baselibs-x86:<prefix>/lib/libz.so.1"
+zlib-devel
diff --git a/zlib.changes b/zlib.changes
index 3650fef..f3e257f 100644
--- a/zlib.changes
+++ b/zlib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
+
+- added baselibs.conf file to build xxbit packages
+  for multilib support
+
 -------------------------------------------------------------------
 Sat Jan 12 03:41:39 CET 2008 - crrodriguez@suse.de
 
diff --git a/zlib.spec b/zlib.spec
index 91cfc2b..93be5ca 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           zlib
 License:        Other uncritical OpenSource License
 Group:          System/Libraries
@@ -17,7 +18,7 @@ Provides:       libz
 Obsoletes:      libz
 AutoReqProv:    on
 Version:        1.2.3
-Release:        87
+Release:        104
 Summary:        Data Compression Library
 Source:         zlib-%{version}.tar.bz2
 Patch:          zlib-1.2.1-make-test.patch
@@ -41,6 +42,7 @@ Authors:
     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++
 Provides:       libz:/usr/include/zlib.h
@@ -107,104 +109,107 @@ rm -rf %{buildroot}
 /usr/%{_lib}/libz.a
 
 %changelog
-* Sat Jan 12 2008 - crrodriguez@suse.de
+* Thu Apr 10 2008 ro@suse.de
+- added baselibs.conf file to build xxbit packages
+  for multilib support
+* Sat Jan 12 2008 crrodriguez@suse.de
 - fix library-without-ldconfig-* errors
 - do not delete buildroot on install section
 - run make test in the check section.
-* Thu May 03 2007 - rguenther@suse.de
+* Thu May 03 2007 rguenther@suse.de
 - move documentation files to zlib-devel package
-* Wed Jan 31 2007 - ro@suse.de
+* Wed Jan 31 2007 ro@suse.de
 - remove libgz completely (obsolete long ago)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Sat Dec 17 2005 - kukuk@suse.de
+* Sat Dec 17 2005 kukuk@suse.de
 - Remove unpackaged libz.so symlink
-* Wed Jul 20 2005 - meissner@suse.de
+* Wed Jul 20 2005 meissner@suse.de
 - Upgraded to 1.2.3. Security fix is now in mainline.
-* Mon Jul 04 2005 - meissner@suse.de
+* Mon Jul 04 2005 meissner@suse.de
 - fixed memory corruption problem #94926, CAN-2005-2096.
-* Fri Apr 01 2005 - kukuk@suse.de
+* Fri Apr 01 2005 kukuk@suse.de
 - Remove movage of setting CFLAGS
-* Tue Mar 29 2005 - kukuk@suse.de
+* Tue Mar 29 2005 kukuk@suse.de
 - Update to 1.2.2.2
 - Fix compiling with gcc 3.3 and 4.0
-* Mon Feb 28 2005 - meissner@suse.de
+* Mon Feb 28 2005 meissner@suse.de
 - Use __printf__ in format attribute to avoid printf defines.
-* Wed Feb 23 2005 - meissner@suse.de
+* Wed Feb 23 2005 meissner@suse.de
 - supply format arguments to gzprintf().
-* Tue Feb 08 2005 - ro@suse.de
+* Tue Feb 08 2005 ro@suse.de
 - update to 1.2.2
-* Wed Aug 25 2004 - ro@suse.de
+* Wed Aug 25 2004 ro@suse.de
 - updated crash patch to version from Dmitry (#44087)
-* Mon Aug 23 2004 - ro@suse.de
+* Mon Aug 23 2004 ro@suse.de
 - added fix for crash on invalid input (#44087)
-* Thu Dec 04 2003 - ro@suse.de
+* Thu Dec 04 2003 ro@suse.de
 - update to 1.2.1
-* Fri Nov 21 2003 - kukuk@suse.de
+* Fri Nov 21 2003 kukuk@suse.de
 - Use RPM_OPT_FLAGS
 - Compile with no execstack
-* Mon Oct 20 2003 - ro@suse.de
+* Mon Oct 20 2003 ro@suse.de
 - don't build as root
-* Mon May 12 2003 - kukuk@suse.de
+* Mon May 12 2003 kukuk@suse.de
 - Add defattr
-* Mon Mar 03 2003 - ro@suse.de
+* Mon Mar 03 2003 ro@suse.de
 - do use vsnprintf
-* Sun Feb 16 2003 - olh@suse.de
+* Sun Feb 16 2003 olh@suse.de
 - no absolute symlinks for libz.so
-* Thu Jul 25 2002 - kukuk@suse.de
+* Thu Jul 25 2002 kukuk@suse.de
 - Rename to zlib
 - Splitt off zlib-devel
-* Fri Jul 05 2002 - bk@suse.de
+* Fri Jul 05 2002 bk@suse.de
 - enable make test
-* Mon May 27 2002 - ro@suse.de
+* Mon May 27 2002 ro@suse.de
 - update to 1.1.4 including the previous security patch
 - Returned incorrect error (Z_MEM_ERROR) on some invalid data
 - Avoid accesses before window for invalid distances with inflate window
   less than 32K.
 - force windowBits > 8 to avoid a bug in the encoder for a window size
   of 256 bytes. (A complete fix will be available in 1.1.5).
-* Mon Feb 25 2002 - ro@suse.de
+* Mon Feb 25 2002 ro@suse.de
 - remove executable bits from manpage and include file
-* Thu Feb 07 2002 - draht@suse.de
+* Thu Feb 07 2002 draht@suse.de
 - prevent double free() (security problem) with
   zlib-1.1.3-zfree.dif
-* Tue Dec 11 2001 - froh@suse.de
+* Tue Dec 11 2001 froh@suse.de
 - fixed specfile to use %%_libdir for make install for
   the sake of lib64 on S/390.  also updated old sparc64 %%ifarch at
   this point.
-* Tue Dec 04 2001 - ro@suse.de
+* Tue Dec 04 2001 ro@suse.de
 - added Provides zlib-devel for compatibility
-* Tue May 01 2001 - kukuk@suse.de
+* Tue May 01 2001 kukuk@suse.de
 - Minor spec file fixes for sparc64
-* Thu Dec 07 2000 - kukuk@suse.de
+* Thu Dec 07 2000 kukuk@suse.de
 - Install only shared library in /%%{_lib}
-* Wed Dec 06 2000 - ro@suse.de
+* Wed Dec 06 2000 ro@suse.de
 - install main lib in /%%{_lib} not /usr/%%{_lib}
-* Mon Oct 02 2000 - kukuk@suse.de
+* Mon Oct 02 2000 kukuk@suse.de
 - Use %%{_lib} macro
-* Mon Sep 25 2000 - ro@suse.de
+* Mon Sep 25 2000 ro@suse.de
 - sorted
-* Wed Apr 05 2000 - bk@suse.de
+* Wed Apr 05 2000 bk@suse.de
 - fixed BuildRoot support
-* Mon Apr 03 2000 - bk@suse.de
+* Mon Apr 03 2000 bk@suse.de
 - added buildroot for build with dynamically linked rpm which uses libz(s390)
-* Thu Jan 20 2000 - aj@suse.de
+* Thu Jan 20 2000 aj@suse.de
 - /usr/man -> /usr/share/man
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Tue Jul 13 1999 - ro@suse.de
+* Tue Jul 13 1999 ro@suse.de
 - added zutil.h
-* Thu Mar 04 1999 - ro@suse.de
+* Thu Mar 04 1999 ro@suse.de
 - moved from /usr/X11R6 to usr
 - libgz is now only a link to libz
 - "libgz.so.1" is provided from specfile
-* Tue Aug 25 1998 - ro@suse.de
+* Tue Aug 25 1998 ro@suse.de
 - update to 1.1.3
-* Fri Mar 20 1998 - ro@suse.de
+* Fri Mar 20 1998 ro@suse.de
 - update to 1.1.2
-* Mon Mar 02 1998 - ro@suse.de
+* Mon Mar 02 1998 ro@suse.de
 - update to 1.1.1
-* Fri Feb 27 1998 - ro@suse.de
+* Fri Feb 27 1998 ro@suse.de
 - update to version 1.0.9
   created own specfile for easier maintenance
   included man-pages