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
This commit is contained in:
Marcus Meissner 2016-08-24 15:13:36 +00:00 committed by Git OBS Bridge
parent 65e1f18e08
commit abe26b8bb3
3 changed files with 16 additions and 0 deletions

View File

@ -1,4 +1,5 @@
libmagic1
requires "file-magic = <version>"
file-devel
requires -file-<targettype>
requires "libmagic1-<targettype> = <version>"

View File

@ -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

View File

@ -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