From 58339c063006aa57f76daae7fe9d75ca2c2d44f2013dfa30693ba5e48849ddd5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 2 Feb 2007 00:33:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=2 --- dietzlib.changes | 5 +++++ dietzlib.spec | 40 +++++++++++++++++++----------------- zlib.changes | 5 +++++ zlib.spec | 53 +++++++++++++++++++++++------------------------- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/dietzlib.changes b/dietzlib.changes index 0eb34ff..e5814c9 100644 --- a/dietzlib.changes +++ b/dietzlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 2 00:41:40 CET 2007 - ro@suse.de + +- added -fno-stack-protector + ------------------------------------------------------------------- Wed Jan 25 21:31:09 CET 2006 - mls@suse.de diff --git a/dietzlib.spec b/dietzlib.spec index 13728c2..b345283 100644 --- a/dietzlib.spec +++ b/dietzlib.spec @@ -1,34 +1,34 @@ # # spec file for package dietzlib (Version 1.2.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -Name: dietzlib -BuildRequires: dietlibc -License: Other License(s), see package -Group: System/Libraries -Autoreqprov: on -Version: 1.2.3 -Release: 3 -Summary: Data Compression Library -Source: zlib-%{version}.tar.bz2 -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 -URL: http://www.zlib.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Name: dietzlib +BuildRequires: dietlibc +License: Other License(s), see package +Group: System/Libraries +Autoreqprov: on +Version: 1.2.3 +Release: 36 +Summary: Data Compression Library +Source: zlib-%{version}.tar.bz2 +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 +URL: http://www.zlib.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt -(deflate format) and rfc1952.txt (gzip format). These documents are +(deflate format), and rfc1952.txt (gzip format). These documents are also available in other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html. @@ -49,7 +49,7 @@ Authors: %build CC="diet -v gcc" \ LD="diet -v gcc" \ -CFLAGS="$RPM_OPT_FLAGS" ./configure --static +CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" ./configure --static make make test @@ -68,6 +68,8 @@ rm -rf %RPM_BUILD_ROOT /usr/%{_lib}/libdiet_z.a %changelog -n dietzlib +* Fri Feb 02 2007 - ro@suse.de +- added -fno-stack-protector * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Jul 27 2005 - ro@suse.de diff --git a/zlib.changes b/zlib.changes index 4385184..d84c367 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 31 13:02:30 CET 2007 - ro@suse.de + +- remove libgz completely (obsolete long ago) + ------------------------------------------------------------------- Wed Jan 25 21:31:09 CET 2006 - mls@suse.de diff --git a/zlib.spec b/zlib.spec index 30150c6..b22f628 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,31 +1,31 @@ # # spec file for package zlib (Version 1.2.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -Name: zlib -License: Other License(s), see package -Group: System/Libraries -Provides: libgz.so.1 libz -Obsoletes: libz -Autoreqprov: on -Version: 1.2.3 -Release: 4 -Summary: Data Compression Library -Source: zlib-%{version}.tar.bz2 -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 -URL: http://www.zlib.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Name: zlib +License: Other License(s), see package +Group: System/Libraries +Provides: libz +Obsoletes: libz +Autoreqprov: on +Version: 1.2.3 +Release: 37 +Summary: Data Compression Library +Source: zlib-%{version}.tar.bz2 +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 +URL: http://www.zlib.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt @@ -41,11 +41,11 @@ Authors: Michael Mauldin %package devel -Summary: Include Files and Libraries mandatory for Development. -Group: Development/Languages/C and C++ -Provides: libz:/usr/include/zlib.h -Requires: zlib = %{version} -Autoreqprov: on +Summary: Include Files and Libraries mandatory for Development. +Group: Development/Languages/C and C++ +Provides: libz:/usr/include/zlib.h +Requires: zlib = %{version} +Autoreqprov: on %description devel This package contains all necessary include files and libraries needed @@ -82,9 +82,6 @@ install -m 644 libz.a $RPM_BUILD_ROOT/usr/%{_lib} # manpage install -m 644 zlib.3 $RPM_BUILD_ROOT/%{_mandir}/man3 install -m 644 zutil.h $RPM_BUILD_ROOT/usr/include -# libgz alias (hopefully unused by now) -ln -sf libz.a $RPM_BUILD_ROOT/usr/%{_lib}/libgz.a -ln -sf ../../%{_lib}/libz.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libgz.so.1 %clean rm -rf %RPM_BUILD_ROOT @@ -92,14 +89,12 @@ rm -rf %RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README ChangeLog algorithm.txt -/usr/%{_lib}/libgz.so.1 /%{_lib}/libz.so.1.2.* /%{_lib}/libz.so.1 %files devel %defattr(-,root,root) %doc %{_mandir}/man3/zlib.3.gz -/usr/%{_lib}/libgz.a /usr/include/zlib.h /usr/include/zconf.h /usr/include/zutil.h @@ -107,6 +102,8 @@ rm -rf %RPM_BUILD_ROOT /usr/%{_lib}/libz.a %changelog -n zlib +* Wed Jan 31 2007 - ro@suse.de +- remove libgz completely (obsolete long ago) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sat Dec 17 2005 - kukuk@suse.de