From e4a10c752f8df511224728206dc2f7923ae196da4a03f08913e6581cc1eff607 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 24 Nov 2010 12:22:14 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=20 --- file-5.04-biorad.dif | 26 ++++++++++++++++++++++++++ file.changes | 6 ++++++ file.spec | 6 ++++-- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 file-5.04-biorad.dif diff --git a/file-5.04-biorad.dif b/file-5.04-biorad.dif new file mode 100644 index 0000000..56c4608 --- /dev/null +++ b/file-5.04-biorad.dif @@ -0,0 +1,26 @@ +--- magic/Magdir/images ++++ magic/Magdir/images 2010-11-24 12:11:01.520426341 +0000 +@@ -551,11 +551,18 @@ + # Bio-Rad .PIC is an image format used by microscope control systems + # and related image processing software used by biologists. + # From: Vebjorn Ljosa +-54 leshort 12345 Bio-Rad .PIC Image File +->0 leshort >0 %hd x +->2 leshort >0 %hd, +->4 leshort =1 1 image in file +->4 leshort >1 %hd images in file ++# BOOL values are two-byte integers; use them to rule out false positives. ++# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt ++# Samples: http://www.loci.wisc.edu/software/sample-data ++14 leshort <2 ++>4 leshort >0 ++>49 byte 0 ++>62 leshort <2 ++>>54 leshort 12345 Bio-Rad .PIC Image File ++>>>0 leshort >0 %hd x ++>>>2 leshort >0 %hd, ++>>>4 leshort =1 1 image in file ++>>>4 leshort >1 %hd images in file + + # From Jan "Yenya" Kasprzak + # The description of *.mrw format can be found at diff --git a/file.changes b/file.changes index 990d955..d21eb31 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 24 13:17:11 CET 2010 - werner@suse.de + +- Add patch for Bio-Rad image format to avoid conflicts with other + magic records like RPM and even some ACII files (bnc#654696) + ------------------------------------------------------------------- Fri Nov 5 22:41:23 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/file.spec b/file.spec index d1d86e4..6e22b47 100644 --- a/file.spec +++ b/file.spec @@ -59,7 +59,8 @@ Patch26: file-4.24-solv.dif Patch27: file-5.04-zip2.0.dif Patch28: file-5.03-iso9660.dif Patch29: file-5.04-llvm.dif -Patch30: file-5.04-visibility.patch +Patch30: file-5.04-visibility.patch +Patch31: file-5.04-biorad.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -125,8 +126,9 @@ Authors: %patch27 -p0 -b .zip2.0 %patch28 -p0 -b .iso9600 %patch29 -p0 -b .llvm +%patch30 -p0 -b .vis +%patch31 -p0 -b .biorad %patch -%patch30 %build export LANG=POSIX export LC_ALL=POSIX