rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 421776 from Base:System

Browse Source 
- 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). (forwarded request 421756 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/421776
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=95
This commit is contained in:
Dominique Leuenberger 2016-08-26 21:12:19 +00:00 committed by Git OBS Bridge
commit 7c64d7799c
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
baselibs.conf
View File

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

18
file.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
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
- file-magic is architecture independend, no need for a baselibs
package.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 18 12:24:36 UTC 2016 - werner@suse.de Thu Aug 18 12:24:36 UTC 2016 - werner@suse.de

3
file.spec
View File

@ -79,6 +79,9 @@ Summary: The magic files for libmagic to use
Group: Productivity/File utilities Group: Productivity/File utilities
Obsoletes: libmagic-data < %{version} Obsoletes: libmagic-data < %{version}
Provides: libmagic-data = %{version} Provides: libmagic-data = %{version}
%if 0%{?suse_version} >= 1200
BuildArch: noarch
%endif
%description magic %description magic
This package contains the basic magic files that libmagic reads and uses This package contains the basic magic files that libmagic reads and uses