OBS User unknown 2008-11-28 13:59:05 +00:00 committed by Git OBS Bridge
parent ae9cc70bd9
commit 95686e654b
5 changed files with 37 additions and 5 deletions

10
file-4.24-solv.dif Normal file
View File

@ -0,0 +1,10 @@
--- magic/Localstuff
+++ magic/Localstuff 2008-11-27 13:16:49.734433208 +0100
@@ -49,3 +49,7 @@
>44 ulelong >0 \b block size = %ld,
>48 ulequad >0 \b bytes = %lld
+# libsatsolver solv file
+
+0 string SOLV Sat-solver solv file,
+>4 belong x version %ld

View File

@ -111,6 +111,17 @@
- @mv $(MAGIC_FRAGMENT_BASE).mgc $@
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE) $(RAW)
+ $(FILE_COMPILE) -C -m $(RAW)
--- magic/Magdir/compress
+++ magic/Magdir/compress 2008-11-27 13:40:46.805632294 +0100
@@ -9,7 +9,7 @@
# because it tries to uncompress it to figure out what's inside.
# standard unix compress
-#0 string \037\235 compress'd data
+0 string \037\235 compress'd data
#!:mime application/x-compress
>2 byte&0x80 >0 block compressed
>2 byte&0x1f x %d bits
--- magic/Magdir/elf
+++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100
@@ -97,7 +97,7 @@

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 27 13:17:54 CET 2008 - werner@suse.de
- Add libsatsolver file magic
- Re-enable detection of old LZW (.Z) format (bnc#448984)
-------------------------------------------------------------------
Thu Oct 30 12:34:56 CET 2008 - olh@suse.de

View File

@ -34,7 +34,7 @@ Obsoletes: file-32bit
#
# Set Version also in python-magic.spec
Version: 4.24
Release: 41
Release: 42
Summary: A Tool to Determine File Types
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
Patch: file-%{version}.dif
@ -58,6 +58,7 @@ Patch22: file-4.24-cromfs.dif
Patch23: file-4.24-extfs-mp3.dif
Patch24: file-4.24-warn.dif
Patch25: file-4.24-javacheck.dif
Patch26: file-4.24-solv.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -120,6 +121,7 @@ Authors:
%patch23 -p0 -b .extfs-mp3
%patch24 -p0 -b .warn
%patch25 -p0 -b .javacheck
%patch26 -p0 -b .solv
%patch
%build
@ -183,6 +185,9 @@ unset LD_LIBRARY_PATH
%attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
%changelog
* Thu Nov 27 2008 werner@suse.de
- Add libsatsolver file magic
- Re-enable detection of old LZW (.Z) format (bnc#448984)
* Thu Oct 30 2008 olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
* Tue Aug 19 2008 ro@suse.de
@ -261,7 +266,7 @@ unset LD_LIBRARY_PATH
- Add zlib-devel BuildRequires
* Wed Mar 21 2007 werner@suse.de
- Update to file 4.20 due security reason CVE-2007-1536 (#256290)
* Wed Mar 07 2007 rguenther@suse.de
* Tue Mar 06 2007 rguenther@suse.de
- Fix order of changelog entries
* Thu Nov 23 2006 werner@suse.de
- Initialize variable in elf patch
@ -356,7 +361,7 @@ unset LD_LIBRARY_PATH
- removed bogus self-provides
* Tue Jul 23 2002 werner@suse.de
- Add mySQL bytes to magic (bug #16138)
* Sat Jun 08 2002 olh@suse.de
* Fri Jun 07 2002 olh@suse.de
- don't change the union u in readelf.c:tryelf() on ppc64
* Mon Feb 04 2002 werner@suse.de
- Fix looking of manual page
@ -419,7 +424,7 @@ unset LD_LIBRARY_PATH
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Aug 24 1999 uli@suse.de
- added -fsigned-char to CFLAGS (PPC)
* Thu Nov 05 1998 ro@suse.de
* Wed Nov 04 1998 ro@suse.de
- disabled dcore (won't build with glibc-2.0)
* Thu Oct 01 1998 ro@suse.de
- update to 3.26

View File

@ -27,7 +27,7 @@ License: Other uncritical OpenSource License
Group: Development/Languages/Python
AutoReqProv: on
Version: 4.24
Release: 49
Release: 50
Summary: Python module to use libmagic
%py_requires
Source99: file.spec