From 33ebd622ed56ae068795ca07e5c0a192d36760924a65706ff44019139282c440 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 17 Jan 2008 21:50:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=13

---
 file.changes |   5 ++
 file.spec    | 174 ++++++++++++++++++++++++++-------------------------
 2 files changed, 93 insertions(+), 86 deletions(-)

diff --git a/file.changes b/file.changes
index 8fdd6a8..7cc6969 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 15 10:46:05 CET 2008 - werner@suse.de
+
+- Move python-base to python
+
 -------------------------------------------------------------------
 Wed Dec  5 12:11:32 CET 2007 - werner@suse.de
 
diff --git a/file.spec b/file.spec
index c64b477..dcf86fa 100644
--- a/file.spec
+++ b/file.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package file (Version 4.21)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -20,7 +20,7 @@ License:        Other uncritical OpenSource License
 Group:          Productivity/File utilities
 AutoReqProv:    on
 Version:        4.21
-Release:        16
+Release:        25
 Summary:        A Tool to Determine File Types
 Source:         ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
 Patch:          file-%{version}.dif
@@ -81,7 +81,7 @@ Authors:
 %package -n     python-magic
 Summary:        Python module to use libmagic
 Group:          Development/Languages/Python
-Requires:       python-base = %{py_ver}
+Requires:       python = %{py_ver}
 
 %description -n python-magic
 This package contains the python binding that require the magic "file"
@@ -197,210 +197,212 @@ unset LD_LIBRARY_PATH
 %endif
 
 %changelog
-* Wed Dec 05 2007 - werner@suse.de
+* Tue Jan 15 2008 werner@suse.de
+- Move python-base to python
+* Wed Dec 05 2007 werner@suse.de
 - Add X11 cursor magic to Localstuff (bug #346132)
 - New package python-magic, the python API for the libmagic
-* Fri Aug 31 2007 - werner@suse.de
+* Fri Aug 31 2007 werner@suse.de
 - Make regex for awk more robust to avoid conflict with PostScript,
   thanks goes to Werner Lemberg for the report
-* Wed Aug 29 2007 - werner@suse.de
+* Wed Aug 29 2007 werner@suse.de
 - Add Scribus to local magic (bug #298009)
-* Wed Jun 06 2007 - werner@suse.de
+* Wed Jun 06 2007 werner@suse.de
 - Update to file version 4.21 including the last three bug fixes
-* Thu May 24 2007 - werner@suse.de
+* Thu May 24 2007 werner@suse.de
 - Fix of the fix for bug #256290 with CVE-2007-2799
-* Mon May 21 2007 - werner@suse.de
+* Mon May 21 2007 werner@suse.de
 - Expand search area used before regex (also bug #263754)
-* Mon May 14 2007 - werner@suse.de
+* Mon May 14 2007 werner@suse.de
 - More on DoS attack with regex (bug #263754)
 - Avoid crash on unknown option and enable option `-e'
-* Mon Apr 16 2007 - werner@suse.de
+* Mon Apr 16 2007 werner@suse.de
 - Avoid DoS attack with regex (bug #263754)
-* Thu Apr 05 2007 - werner@suse.de
+* Thu Apr 05 2007 werner@suse.de
 - Avoid trouble with variable/macro on ppc64
-* Mon Mar 26 2007 - rguenther@suse.de
+* Mon Mar 26 2007 rguenther@suse.de
 - Add zlib-devel BuildRequires
-* Wed Mar 21 2007 - werner@suse.de
+* Wed Mar 21 2007 werner@suse.de
 - Update to file 4.20 due security reason CVE-2007-1536 (#256290)
-* Tue Mar 06 2007 - rguenther@suse.de
+* Tue Mar 06 2007 rguenther@suse.de
 - Fix order of changelog entries
-* Thu Nov 23 2006 - werner@suse.de
+* Thu Nov 23 2006 werner@suse.de
 - Initialize variable in elf patch
-* Wed Nov 22 2006 - werner@suse.de
+* Wed Nov 22 2006 werner@suse.de
 - Update to new file 4.18
   * Includes most of our extensions (elf, fifo, softmagic)
-* Mon Jun 12 2006 - werner@suse.de
+* Mon Jun 12 2006 werner@suse.de
 - Reenable file to display process name from a core dump (#183685)
-* Mon Mar 27 2006 - werner@suse.de
+* Mon Mar 27 2006 werner@suse.de
 - Add Mono/.Net identfiers  to msdos magics (bug #159708)
-* Fri Mar 24 2006 - werner@suse.de
+* Fri Mar 24 2006 werner@suse.de
 - Update to file version 4.17
   * This version supports new key like `search' and `regex'
   * Port our patches to this version
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jan 16 2006 - werner@suse.de
+* Mon Jan 16 2006 werner@suse.de
 - Add Xen magics
-* Tue Dec 06 2005 - werner@suse.de
+* Tue Dec 06 2005 werner@suse.de
 - Add Structured Storage Entry for PageMaker to local (bug #134895)
-* Thu Oct 20 2005 - werner@suse.de
+* Thu Oct 20 2005 werner@suse.de
 - Update to file version 4.16
-* Tue Aug 23 2005 - werner@suse.de
+* Tue Aug 23 2005 werner@suse.de
 - Fix broken cracklib magic (bug #106007)
-* Mon Jul 25 2005 - werner@suse.de
+* Mon Jul 25 2005 werner@suse.de
 - Update to new file 4.14
 - Split of the development version as own package
-* Fri Jul 01 2005 - werner@suse.de
+* Fri Jul 01 2005 werner@suse.de
 - Even for netware the columns in the magic entry are seperated
   by tabs
 - Add cracklib magics (bug #93673)
-* Mon Jun 13 2005 - mmj@suse.de
+* Mon Jun 13 2005 mmj@suse.de
 - Add primitive magic for detecting netware loadable modules (NLMs)
 - Don't remove buildroot before install
 - Don't strip binaries explicitly
 - %%doc is implied by %%man
-* Thu Mar 17 2005 - werner@suse.de
+* Thu Mar 17 2005 werner@suse.de
 - Be sure that the pipe/fifo patch works (bug #73644)
-* Thu Mar 10 2005 - werner@suse.de
+* Thu Mar 10 2005 werner@suse.de
 - Be able to use the -s option even on pipes (bug #71074)
 - Do not hang on sockets or pipes not opened on the write side
-* Fri Feb 18 2005 - werner@suse.de
+* Fri Feb 18 2005 werner@suse.de
 - Update to file 4.13 for fixes in handling of bzip2 and DOS files
 - Do not be fooled by minix filesystems magics on jpeg files
-* Fri Nov 26 2004 - werner@suse.de
+* Fri Nov 26 2004 werner@suse.de
 - Update to file 4.12, this may fix a security issue (bug #48576)
-* Tue Sep 28 2004 - werner@suse.de
+* Tue Sep 28 2004 werner@suse.de
 - Correct PCP entries (bug #46111)
-* Thu Sep 16 2004 - werner@suse.de
+* Thu Sep 16 2004 werner@suse.de
 - Read HOWMANY bytes even from a pipe (reported by max)
-* Thu Aug 26 2004 - werner@suse.de
+* Thu Aug 26 2004 werner@suse.de
 - Update to bugfix release 4.09
-* Tue Aug 24 2004 - lmuelle@suse.de
+* Tue Aug 24 2004 lmuelle@suse.de
 - Add -fPIC to the CFLAGS.
-* Wed May 26 2004 - werner@suse.de
+* Wed May 26 2004 werner@suse.de
 - Don't trap into string formats if integers are provided (#41209)
-* Mon May 24 2004 - werner@suse.de
+* Mon May 24 2004 werner@suse.de
 - Check for random data within ELF header (bug #40909)
-* Thu Feb 12 2004 - werner@suse.de
+* Thu Feb 12 2004 werner@suse.de
 - Add name offsets for CORE dumps even for 64bit ELF (bug #34461)
-* Tue Jan 20 2004 - werner@suse.de
+* Tue Jan 20 2004 werner@suse.de
 - Update to 4.07
-* Mon Dec 15 2003 - werner@suse.de
+* Mon Dec 15 2003 werner@suse.de
 - Add workaround for new automake `feature' of ignoring man pages
 - Ensure that the correct break condition is returned if readelf
   past the end of the buffer (bug #33644).
-* Mon Dec 08 2003 - werner@suse.de
+* Mon Dec 08 2003 werner@suse.de
 - Update to 4.06
 - Use /etc/magic:/usr/share/misc/magic as magic and move /etc/magic
   to a real configuration file for _local_ settings (bug #32725).
-* Sat Oct 18 2003 - kukuk@suse.de
+* Sat Oct 18 2003 kukuk@suse.de
 - Add patch to detect policy file for SE Linux
 - Build as normal user
 - Clean up build root
-* Mon Sep 29 2003 - werner@suse.de
+* Mon Sep 29 2003 werner@suse.de
 - Avoid endless loop due wrong alignment in old ELF binaries
-* Tue Sep 16 2003 - werner@suse.de
+* Tue Sep 16 2003 werner@suse.de
 - Extend buffer from 64kb upto 68kB to find ReiserFS (bug #30736)
-* Wed Jul 02 2003 - werner@suse.de
+* Wed Jul 02 2003 werner@suse.de
 - Use _libdir
-* Tue Jul 01 2003 - werner@suse.de
+* Tue Jul 01 2003 werner@suse.de
 - Update to file 4.03
-* Thu Apr 17 2003 - coolo@suse.de
+* Thu Apr 17 2003 coolo@suse.de
 - use BuildRoot
-* Tue Mar 04 2003 - werner@suse.de
+* Tue Mar 04 2003 werner@suse.de
 - Fix buffer overflow in elf detection
-* Tue Dec 17 2002 - olh@suse.de
+* Tue Dec 17 2002 olh@suse.de
 - use RPM_BUILD_ROOT, not BUILD_ROOT in testsuite
-* Mon Nov 11 2002 - ro@suse.de
+* Mon Nov 11 2002 ro@suse.de
 - fix deprecated multiline string literal (from longopt patch)
-* Tue Sep 17 2002 - ro@suse.de
+* Tue Sep 17 2002 ro@suse.de
 - removed bogus self-provides
-* Tue Jul 23 2002 - werner@suse.de
+* Tue Jul 23 2002 werner@suse.de
 - Add mySQL bytes to magic (bug #16138)
-* Fri Jun 07 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
+* Mon Feb 04 2002 werner@suse.de
 - Fix looking of manual page
-* Mon Feb 04 2002 - werner@suse.de
+* Mon Feb 04 2002 werner@suse.de
 - Add some magics for METAFONT format files
 - Add inofficial long options for LSB
-* Thu Dec 27 2001 - adrian@suse.de
+* Thu Dec 27 2001 adrian@suse.de
 - fix file output for mips binaries. The old output broke several
   ltconfig scripts in other packages and was wrong anyway.
 - recompress tar ball with bz2
-* Wed Dec 19 2001 - werner@suse.de
+* Wed Dec 19 2001 werner@suse.de
 - update to version 3.37
-* Sat Jun 30 2001 - bk@suse.de
+* Sat Jun 30 2001 bk@suse.de
 - update to version 3.33
 - don't change the union u in readelf.c:tryelf() on s390x.
 - option i: fix one-byte memory underallocation - strcat adds '\0'
-* Thu Jun 07 2001 - werner@suse.de
+* Thu Jun 07 2001 werner@suse.de
 - Autoconf and Elf header: make it work again
-* Fri May 04 2001 - werner@suse.de
+* Fri May 04 2001 werner@suse.de
 - Make symlink /etc/magic a relative one
-* Tue Jan 16 2001 - werner@suse.de
+* Tue Jan 16 2001 werner@suse.de
 - Change order to find WAVE and TTF data before G3, apple and
   macintosh data.
 - Change string detection of PFM data to bit comparision masking
   out the third bit to make raw G3 work.
-* Sun Dec 03 2000 - schwab@suse.de
+* Sun Dec 03 2000 schwab@suse.de
 - Don't match against artificial null byte.
 - Fix resource leaks.
-* Tue Nov 28 2000 - aj@suse.de
+* Tue Nov 28 2000 aj@suse.de
 - Add LFS support.
-* Tue Nov 14 2000 - werner@suse.de
+* Tue Nov 14 2000 werner@suse.de
 - Correct version handling of Linux/i386 Kernel setup header
-* Mon Nov 13 2000 - werner@suse.de
+* Mon Nov 13 2000 werner@suse.de
 - Fix handling of Microsoft Access Database in comparision
   with Digifax-G3-File.
-* Tue Oct 03 2000 - kukuk@suse.de
+* Tue Oct 03 2000 kukuk@suse.de
 - fix inclusion of config.h
 - Add group tag
-* Thu Sep 28 2000 - werner@suse.de
+* Thu Sep 28 2000 werner@suse.de
 - Move Magdir changes into misc dif
 - Remove exectuable from text scripts
-* Fri Sep 15 2000 - werner@suse.de
+* Fri Sep 15 2000 werner@suse.de
 - Update to version 3.32
-* Tue Jun 20 2000 - werner@suse.de
+* Tue Jun 20 2000 werner@suse.de
 - /usr/lib/magic -> /usr/share/misc/magic
-* Thu Feb 03 2000 - schwab@suse.de
+* Thu Feb 03 2000 schwab@suse.de
 - Ignore SHT_DYNSYM sections when deciding whether object is stripped.
-* Fri Jan 28 2000 - schwab@suse.de
+* Fri Jan 28 2000 schwab@suse.de
 - Fix int32 vs long problem.
-* Thu Jan 27 2000 - schwab@suse.de
+* Thu Jan 27 2000 schwab@suse.de
 - Fix non-ascii literal characters in string
 - Specfile cleanup, get rid of Makefile.Linux
 - /usr/man -> /usr/share/man
-* Thu Nov 25 1999 - schwab@suse.de
+* Thu Nov 25 1999 schwab@suse.de
 - Fix location of magic file.
-* Tue Nov 23 1999 - kukuk@suse.de
+* Tue Nov 23 1999 kukuk@suse.de
 - Update to version 3.27
 - Add patches for SPARC
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Tue Aug 24 1999 - uli@suse.de
+* Tue Aug 24 1999 uli@suse.de
 - added -fsigned-char to CFLAGS (PPC)
-* Wed Nov 04 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
+* Thu Oct 01 1998 ro@suse.de
 - update to 3.26
 - hacked dcore.c to build with glibc-2.1
-* Fri Oct 10 1997 - florian@suse.de
+* Fri Oct 10 1997 florian@suse.de
 - add some more entries to magic
-* Wed Jun 25 1997 - florian@suse.de
+* Wed Jun 25 1997 florian@suse.de
 - add additional entries to recognize LaTeX files
-* Tue May 27 1997 - florian@suse.de
+* Tue May 27 1997 florian@suse.de
 - add some additional entries from mgetty/vgetty
 - add additional entries for CLISP and GNU gettext from Bruno Haible
-* Wed Jan 22 1997 - florian@suse.de
+* Wed Jan 22 1997 florian@suse.de
 - update to version 3.22
-* Thu Jan 02 1997 - florian@suse.de
+* Thu Jan 02 1997 florian@suse.de
 - recognise german umlauts as text: dirty hack, but also call "setlocale"
   for correctly installed systems...
 - add "dcore"-program to show some information about core-files
-* Thu Jan 02 1997 - florian@suse.de
+* Thu Jan 02 1997 florian@suse.de
 - update to version 3.21
 - mv /etc/magic /usr/lib/magic (/etc/magic is still a symlink to new
   location)
-* Thu Jan 02 1997 - florian@suse.de
+* Thu Jan 02 1997 florian@suse.de
 - added missing entries for G3-fax (from mgetty source)