From 10808c0ed5a2ef1527ecebbcdff1ace5b38c37f841bf11b26471a7590e52cc64 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 8 Jan 2009 13:35:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=8 --- zlib.changes | 5 +++++ zlib.spec | 29 ++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/zlib.changes b/zlib.changes index f3e257f..69cc631 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/zlib.spec b/zlib.spec index 93be5ca..241af0f 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,10 +1,17 @@ # # spec file for package zlib (Version 1.2.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,13 +19,18 @@ Name: zlib -License: Other uncritical OpenSource License +License: zlib/libpng License; zlib license. See http://zlib.net/zlib_license.html Group: System/Libraries Provides: libz Obsoletes: libz AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: zlib-64bit +%endif +# Version: 1.2.3 -Release: 104 +Release: 133 Summary: Data Compression Library Source: zlib-%{version}.tar.bz2 Patch: zlib-1.2.1-make-test.patch @@ -48,6 +60,11 @@ Group: Development/Languages/C and C++ Provides: libz:/usr/include/zlib.h Requires: zlib = %{version} glibc-devel AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: zlib-devel-64bit +%endif +# %description devel This package contains all necessary include files and libraries needed @@ -109,6 +126,8 @@ rm -rf %{buildroot} /usr/%{_lib}/libz.a %changelog +* Wed Jan 07 2009 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support