.
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=28
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
299510245e
commit
5b5a4f8c55
@ -33,7 +33,7 @@
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
@@ -309,4 +312,5 @@ typedef struct {
|
||||
@@ -330,4 +333,5 @@ typedef struct {
|
||||
#define AV_386_SSE4_1 0x00800000
|
||||
#define AV_386_SSE4_2 0x01000000
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eac62f5c2f25628420279c6a36f2c14911c776cdad89043c8ab69c0a448192e5
|
||||
size 489733
|
||||
@ -88,7 +88,7 @@
|
||||
+# This must precede the heuristic for raw G3 data
|
||||
+4 string Standard\ Jet\ DB Microsoft Access Database
|
||||
--- magic/Magdir/msdos
|
||||
+++ magic/Magdir/msdos 2011-06-14 14:36:26.175926257 +0000
|
||||
+++ magic/Magdir/msdos 2011-06-14 14:36:26.000000000 +0000
|
||||
@@ -98,9 +98,9 @@
|
||||
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
|
||||
>>>(0x3c.l+22) leshort&0x1000 >0 system file
|
||||
@ -102,7 +102,7 @@
|
||||
# hooray, there's a DOS extender using the PE format, with a valid PE
|
||||
# executable inside (which just prints a message and exits if run in win)
|
||||
--- magic/Makefile.am
|
||||
+++ magic/Makefile.am 2011-06-14 14:32:37.504427061 +0000
|
||||
+++ magic/Makefile.am 2011-08-23 14:50:29.287926799 +0000
|
||||
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
|
||||
MAGIC_DIR = $(top_srcdir)/magic
|
||||
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
|
||||
@ -192,18 +192,46 @@
|
||||
+ done >> $@
|
||||
|
||||
# FIXME: Build file natively as well so that it can be used to compile
|
||||
# the target's magic file
|
||||
@@ -251,8 +263,5 @@ FILE_COMPILE = $(top_builddir)/src/file
|
||||
# the target's magic file; for now we bail if the local version does not match
|
||||
@@ -251,19 +263,22 @@ FILE_COMPILE = $(top_builddir)/src/file
|
||||
FILE_COMPILE_DEP = $(FILE_COMPILE)
|
||||
endif
|
||||
|
||||
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
- @rm -fr magic
|
||||
- @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
- else \
|
||||
- v=$$(file --version | sed -e s/file-// -e q); \
|
||||
- if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
|
||||
- echo "Cannot use the installed version of file ($$v) to"; \
|
||||
- echo "cross-compile file ${PACKAGE_VERSION}"; \
|
||||
- echo "Please install file ${PACKAGE_VERSION} locally first"; \
|
||||
- exit 1; \
|
||||
- fi; \
|
||||
- fi)
|
||||
- $(FILE_COMPILE) -C -m magic
|
||||
- @rm -fr magic
|
||||
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
|
||||
+ $(FILE_COMPILE) -C -m $(RAW)
|
||||
+
|
||||
+#${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
||||
+# @rm -fr magic
|
||||
+# @mkdir magic && cp -p $(EXTRA_DIST) magic
|
||||
+# @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
||||
+# echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
||||
+# else \
|
||||
+# v=$$(file --version | sed -e s/file-// -e q); \
|
||||
+# if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
|
||||
+# echo "Cannot use the installed version of file ($$v) to"; \
|
||||
+# echo "cross-compile file ${PACKAGE_VERSION}"; \
|
||||
+# echo "Please install file ${PACKAGE_VERSION} locally first"; \
|
||||
+# exit 1; \
|
||||
+# fi; \
|
||||
+# fi)
|
||||
+# $(FILE_COMPILE) -C -m magic
|
||||
+# @rm -fr magic
|
||||
--- src/Makefile.am
|
||||
+++ src/Makefile.am 2008-04-14 15:14:56.000000000 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
3
file-5.08.tar.gz
Normal file
3
file-5.08.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dd2f18f5f344fe89938fcaf5959808fb98e4ff20c2e30f24f234e27946e3a555
|
||||
size 605337
|
||||
11
file.changes
11
file.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 23 14:55:19 UTC 2011 - werner@suse.de
|
||||
|
||||
- Update to file version 5.08
|
||||
* Fix detection of Zip files (Mantis #128).
|
||||
* Make some minor improvements to file(1).
|
||||
* Rename MIME types for filesystem objects for consistency with
|
||||
xdg-utils. Typically this means that application/x-foo becomes
|
||||
inode/foo, but some names also change slightly, e.g.
|
||||
application/x-character-device becomes inode/chardevice.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 18 12:00:20 CEST 2011 - werner@suse.de
|
||||
|
||||
|
||||
@ -30,10 +30,10 @@ Obsoletes: file-64bit
|
||||
%endif
|
||||
#
|
||||
# Set Version also in python-magic.spec
|
||||
Version: 5.07
|
||||
Release: 3
|
||||
Version: 5.08
|
||||
Release: 1
|
||||
Summary: A Tool to Determine File Types
|
||||
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
|
||||
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
||||
Source2: baselibs.conf
|
||||
Patch: file-%{version}.dif
|
||||
Patch1: file-5.07-misc.dif
|
||||
@ -122,7 +122,7 @@ Authors:
|
||||
%patch30 -p0 -b .vis
|
||||
%patch31 -p0 -b .biorad
|
||||
%patch32 -p0 -b .clicfs
|
||||
%patch
|
||||
%patch -b .0
|
||||
|
||||
%build
|
||||
export LANG=POSIX
|
||||
|
||||
Loading…
Reference in New Issue
Block a user