From cf05247f692eb4cba152e35806705f9c8e1427ad30aa494747b6d4f1391f91e0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 24 Aug 2016 14:16:35 +0000 Subject: [PATCH 1/2] - file-magic is architecture independend, no need for a baselibs package. OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=145 --- baselibs.conf | 2 -- file.changes | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 978c84d..ccb07e9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,4 @@ libmagic1 - requires "file-magic- = " file-devel requires -file- requires "libmagic1- = " -file-magic diff --git a/file.changes b/file.changes index b2100fa..901e08f 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 24 14:16:08 UTC 2016 - meissner@suse.com + +- file-magic is architecture independend, no need for a baselibs + package. + ------------------------------------------------------------------- Thu Aug 18 12:24:36 UTC 2016 - werner@suse.de From 5ee9d6afb59647f8fbbb3ef48bdce77d9094f05cf001333c078586f4424ababa Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 24 Aug 2016 15:13:36 +0000 Subject: [PATCH 2/2] Accepting request 421756 from home:dimstar:Factory - Fix boo#995089: * Do not attempt to produce a file-magic-32bit package: there is nothing arch-dependant in this package (for completeness, this was already fixed just before by Marcus) * Fix baselibs.conf for libmagic1-32bit to require file-magic instead of file-magic-32bit. * Build file-magic as noarch on openSUSE >= 1200 (where rpm is new enough to support this). OBS-URL: https://build.opensuse.org/request/show/421756 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=146 --- baselibs.conf | 1 + file.changes | 12 ++++++++++++ file.spec | 3 +++ 3 files changed, 16 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index ccb07e9..cee82f7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,5 @@ libmagic1 + requires "file-magic = " file-devel requires -file- requires "libmagic1- = " diff --git a/file.changes b/file.changes index 901e08f..f8b9fec 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 24 14:16:09 UTC 2016 - dimstar@opensuse.org + +- Fix boo#995089: + * Do not attempt to produce a file-magic-32bit package: there is + nothing arch-dependant in this package (for completeness, this + was already fixed just before by Marcus) + * Fix baselibs.conf for libmagic1-32bit to require file-magic + instead of file-magic-32bit. + * Build file-magic as noarch on openSUSE >= 1200 (where rpm is + new enough to support this). + ------------------------------------------------------------------- Wed Aug 24 14:16:08 UTC 2016 - meissner@suse.com diff --git a/file.spec b/file.spec index 821efa6..36eee69 100644 --- a/file.spec +++ b/file.spec @@ -79,6 +79,9 @@ Summary: The magic files for libmagic to use Group: Productivity/File utilities Obsoletes: libmagic-data < %{version} Provides: libmagic-data = %{version} +%if 0%{?suse_version} >= 1200 +BuildArch: noarch +%endif %description magic This package contains the basic magic files that libmagic reads and uses