From d05f2edcc8ce0cffdbcf99242d01d234c8791f5afa29188f56efff3a67e10ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Jan 2013 22:07:47 +0000 Subject: [PATCH 1/2] Accepting request 149489 from home:jengelh:branches:Archiving - Executing autoreconf requires autoconf - Set RPM groups to the common ones we use for library and "-devel" packages OBS-URL: https://build.opensuse.org/request/show/149489 OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=32 --- bzip2.changes | 7 +++++++ bzip2.spec | 32 +++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/bzip2.changes b/bzip2.changes index d41c82e..927f953 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 21 19:15:09 UTC 2013 - jengelh@inai.de + +- Executing autoreconf requires autoconf +- Set RPM groups to the common ones we use for library and + "-devel" packages + ------------------------------------------------------------------- Sun Feb 12 23:00:21 UTC 2012 - crrodriguez@opensuse.org diff --git a/bzip2.spec b/bzip2.spec index 8dfd6aa..a71605d 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,7 +1,7 @@ # # spec file for package bzip2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,21 +19,11 @@ Name: bzip2 Version: 1.0.6 Release: 0 -Provides: bzip -Obsoletes: bzip -BuildRequires: libtool -BuildRequires: pkg-config -# The following is a kludge to get updating bzip2 to after the split work -PreReq: libbz2-1 -# bug437293 -%ifarch ppc64 -Obsoletes: bzip2-64bit -%endif -# Url: http://www.bzip.org/ Summary: A Program for Compressing Files License: BSD-3-Clause Group: Productivity/Archiving/Compression + Source: bzip2-%{version}.tar.gz Source1: bznew.gz Source2: bznew.1.gz @@ -46,6 +36,17 @@ Patch5: bzip2-unsafe_strcpy.patch Patch6: bzip2-point-to-doc-pkg.patch Patch7: bzip2-ocloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf >= 2.57 +BuildRequires: libtool +BuildRequires: pkg-config +# The following is a kludge to get updating bzip2 to after the split work +PreReq: libbz2-1 +# bug437293 +%ifarch ppc64 +Obsoletes: bzip2-64bit +%endif +Provides: bzip +Obsoletes: bzip %description The bzip2 program is a very powerful program for compressing files. @@ -62,15 +63,16 @@ The bzip2 program and library documentation. %package -n libbz2-1 Summary: The bzip2 runtime library -Group: Productivity/Archiving/Compression +Group: System/Libraries %description -n libbz2-1 The bzip2 runtime library %package -n libbz2-devel Summary: The bzip2 runtime library development files -Group: Development/Libraries/Other -Requires: libbz2-1 = %{version} glibc-devel +Group: Development/Libraries/C and C++ +Requires: glibc-devel +Requires: libbz2-1 = %{version} %description -n libbz2-devel The bzip2 runtime library development files. From 3c41e5564c80837d620f2d16aa39eda5100fa9c2981f25a7a07040be532ea55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Jan 2013 22:10:23 +0000 Subject: [PATCH 2/2] - Add %{version} to Obsoletes/Provides OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=33 --- bzip2.changes | 5 +++++ bzip2.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bzip2.changes b/bzip2.changes index 927f953..d2ebbf8 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 21 22:09:52 UTC 2013 - idonmez@suse.com + +- Add %{version} to Obsoletes/Provides + ------------------------------------------------------------------- Mon Jan 21 19:15:09 UTC 2013 - jengelh@inai.de diff --git a/bzip2.spec b/bzip2.spec index a71605d..8575214 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -23,7 +23,6 @@ Url: http://www.bzip.org/ Summary: A Program for Compressing Files License: BSD-3-Clause Group: Productivity/Archiving/Compression - Source: bzip2-%{version}.tar.gz Source1: bznew.gz Source2: bznew.1.gz @@ -45,8 +44,8 @@ PreReq: libbz2-1 %ifarch ppc64 Obsoletes: bzip2-64bit %endif -Provides: bzip -Obsoletes: bzip +Provides: bzip = %{version} +Obsoletes: bzip < %{version} %description The bzip2 program is a very powerful program for compressing files.