Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Wed Aug 24 11:33:50 CEST 2011.
-------- --- file/file.changes 2011-07-18 12:03:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2011-08-23 16:56:34.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 23 14:55:19 UTC 2011 - [email protected] + +- 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. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- file-5.07.dif file-5.07.tar.bz2 New: ---- file-5.08.dif file-5.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.aY4gjt/_old 2011-08-24 11:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.aY4gjt/_new 2011-08-24 11:30:35.000000000 +0200 @@ -30,10 +30,10 @@ %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 @@ %patch30 -p0 -b .vis %patch31 -p0 -b .biorad %patch32 -p0 -b .clicfs -%patch +%patch -b .0 %build export LANG=POSIX ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.aY4gjt/_old 2011-08-24 11:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.aY4gjt/_new 2011-08-24 11:30:35.000000000 +0200 @@ -27,7 +27,7 @@ Group: Development/Languages/Python AutoReqProv: on Version: 5.07 -Release: 2 +Release: 3 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-4.24-autoconf.dif ++++++ --- /var/tmp/diff_new_pack.aY4gjt/_old 2011-08-24 11:30:35.000000000 +0200 +++ /var/tmp/diff_new_pack.aY4gjt/_new 2011-08-24 11:30:35.000000000 +0200 @@ -24,7 +24,7 @@ +++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000 @@ -34,7 +34,10 @@ #ifndef __fake_elf_h__ - #define __fake_elf_h__ + #define __fake_elf_h__ +#include <features.h> + @@ -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 ++++++ file-5.07.dif -> file-5.08.dif ++++++ --- file/file-5.07.dif 2011-06-14 19:53:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.08.dif 2011-08-23 16:56:32.000000000 +0200 @@ -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 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
