From b4d2acc3162a5e22331046fa6a610a0830eadd778c958e847b75bad956429812 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 18 Aug 2014 16:46:22 +0000 Subject: [PATCH 1/3] Accepting request 245102 from home:fcrozat:branches:Base:System - Add obsoletes/provides to baselibs.conf. OBS-URL: https://build.opensuse.org/request/show/245102 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=102 --- baselibs.conf | 2 ++ file.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 8f26cae..7de0522 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ libmagic1 + obsoletes "file- < " + provides "file- = " diff --git a/file.changes b/file.changes index 1344284..76970c9 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 18 16:28:10 UTC 2014 - fcrozat@suse.com + +- Add obsoletes/provides to baselibs.conf. + ------------------------------------------------------------------- Tue Jun 24 16:27:38 UTC 2014 - werner@suse.de From 2a8e4751385e2ab129deea410400327223ce40ffed85feda39e447b15b276474 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 18 Aug 2014 17:05:56 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=103 --- file.changes | 5 +++++ file.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/file.changes b/file.changes index 76970c9..b80095e 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 18 17:05:34 UTC 2014 - werner@suse.de + +- Add file-rpmlintrc to file list + ------------------------------------------------------------------- Mon Aug 18 16:28:10 UTC 2014 - fcrozat@suse.com diff --git a/file.spec b/file.spec index 252ffc6..def8dad 100644 --- a/file.spec +++ b/file.spec @@ -37,6 +37,7 @@ License: BSD-2-Clause Group: Productivity/File utilities Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf +Source3: file-rpmlintrc Patch: file-5.19.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif From 72bacea16c0b50feffc31f6e1e7edebd94bf6030b8d3978cbd6ef5aab8f099ae Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 19 Aug 2014 10:35:12 +0000 Subject: [PATCH 3/3] Accepting request 245157 from home:pgajdos - correctly identify GDBM files created by libgdbm4 [bnc#888308] * add file-5.19-gdbm.patch OBS-URL: https://build.opensuse.org/request/show/245157 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=104 --- file-5.19-gdbm.patch | 20 ++++++++++++++++++++ file.changes | 6 ++++++ file.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 file-5.19-gdbm.patch diff --git a/file-5.19-gdbm.patch b/file-5.19-gdbm.patch new file mode 100644 index 0000000..220f9b1 --- /dev/null +++ b/file-5.19-gdbm.patch @@ -0,0 +1,20 @@ +Index: magic/Magdir/database +=================================================================== +--- magic/Magdir/database.orig 2014-06-03 21:17:27.000000000 +0200 ++++ magic/Magdir/database 2014-08-18 14:40:57.296931686 +0200 +@@ -9,9 +9,13 @@ + # GDBM magic numbers + # Will be maintained as part of the GDBM distribution in the future. + # +-0 belong 0x13579ace GNU dbm 1.x or ndbm database, big endian ++0 belong 0x13579acd GNU dbm 1.x or ndbm database, big endian, 32-bit + !:mime application/x-gdbm +-0 lelong 0x13579ace GNU dbm 1.x or ndbm database, little endian ++0 lelong 0x13579acd GNU dbm 1.x or ndbm database, little endian, 32-bit ++!:mime application/x-gdbm ++0 belong 0x13579acf GNU dbm 1.x or ndbm database, big endian, 64-bit ++!:mime application/x-gdbm ++0 lelong 0x13579acf GNU dbm 1.x or ndbm database, little endian, 64-bit + !:mime application/x-gdbm + 0 string GDBM GNU dbm 2.x database + !:mime application/x-gdbm diff --git a/file.changes b/file.changes index b80095e..00fea05 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 19 09:30:38 UTC 2014 - pgajdos@suse.com + +- correctly identify GDBM files created by libgdbm4 [bnc#888308] + * add file-5.19-gdbm.patch + ------------------------------------------------------------------- Mon Aug 18 17:05:34 UTC 2014 - werner@suse.de diff --git a/file.spec b/file.spec index def8dad..307a7f4 100644 --- a/file.spec +++ b/file.spec @@ -63,6 +63,7 @@ Patch34: file-5.18-endian.patch Patch35: file-5.12-nitpick.dif Patch36: file-5.15-clear-invalid.patch Patch37: file-secure_getenv.patch +Patch38: file-5.19-gdbm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -129,6 +130,7 @@ to develop applications that require the magic "file" interface. %patch35 -p0 -b .nitpick %patch36 -p1 -b .clear %patch37 -p1 -b .getenv +%patch38 -p0 -b .gdbm %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in