packages: file/file.spec, file/automake.patch (NEW), file/searchpath.patch ...

glen glen at pld-linux.org
Tue Jan 18 19:56:46 CET 2011 

Author: glen                         Date: Tue Jan 18 18:56:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.05, python bindings are now pure-python

---- Files affected:
packages/file:
   file.spec (1.173 -> 1.174) , automake.patch (NONE -> 1.1)  (NEW), searchpath.patch (NONE -> 1.1)  (NEW), file-debian.patch (1.27 -> NONE)  (REMOVED), file-lmagic.patch (1.1 -> NONE)  (REMOVED), file-msdos.patch (1.7 -> NONE)  (REMOVED), file-python.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.173 packages/file/file.spec:1.174
--- packages/file/file.spec:1.173	Sun Oct  3 11:29:47 2010
+++ packages/file/file.spec	Tue Jan 18 19:56:41 2011
@@ -4,7 +4,7 @@
 %bcond_without	python		# don't build python-magic module
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	tests		# don't perform "make check"
-#
+
 Summary:	A utility for determining file types
 Summary(cs.UTF-8):	Program pro zjišťování typu souborů
 Summary(da.UTF-8):	Et værktøj til bestemmelse af filtyper
@@ -29,33 +29,34 @@
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.04
+Version:	5.05
 Release:	1
 License:	distributable
 Group:		Applications/File
-Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	accade81ff1cc774904b47c72c8aeea0
+#Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.astron.com/pri/%{name}-%{version}.tar.gz
+# Source0-md5:	0b429063710457be2bd17a18389cb018
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	c157a183b64156f8baafaefd9cbf04c1
 Source2:	%{name}-zisofs.magic
 Source3:	%{name}-mscompress.magic
 Source4:	%{name}-magic.mime-gen.awk
-Patch0:		%{name}-debian.patch
+Source5:	php-wsdl-cache.magic
 Patch1:		%{name}-sparc.patch
-Patch2:		%{name}-lmagic.patch
 Patch3:		%{name}-greedy-dump.patch
 Patch4:		%{name}-selinux.patch
-Patch5:		%{name}-msdos.patch
 Patch6:		%{name}-fusecompress.patch
-Patch7:		%{name}-python.patch
 Patch8:		%{name}-dbase.patch
+Patch9:		searchpath.patch
+Patch10:	automake.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.219
 %if %{with python}
-BuildRequires:	python-devel >= 1:2.5
-BuildRequires:	python-modules >= 1:2.5
+BuildRequires:	python-devel
+BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 %endif
 Requires:	libmagic = %{version}-%{release}
@@ -249,15 +250,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 rm -f magic/Magdir/{*.orig,*~}
 
@@ -296,16 +295,17 @@
 
 %if %{with python}
 cd python
-python setup.py install \
+%{__python} setup.py install \
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
 cd ..
+%py_postclean
 %endif
 
 install -D magic/Localstuff $RPM_BUILD_ROOT%{_sysconfdir}/magic
 
-cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} >$RPM_BUILD_ROOT%{_datadir}/misc/magic
-awk -f %{SOURCE4} <$RPM_BUILD_ROOT%{_datadir}/misc/magic >$RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
+cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} %{SOURCE5} >$RPM_BUILD_ROOT%{_datadir}/misc/magic
+awk -f %{SOURCE4} < $RPM_BUILD_ROOT%{_datadir}/misc/magic > $RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -380,8 +380,11 @@
 %if %{with python}
 %files -n python-magic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/magic.so
-%{py_sitedir}/Magic_file_extensions-*.egg-info
+%doc python/README python/example.py
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/Magic_file_extensions-*.egg-info
+%endif
+%{py_sitescriptdir}/magic.py[co]
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -390,6 +393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2011/01/18 18:56:41  glen
+- up to 5.05, python bindings are now pure-python
+
 Revision 1.173  2010/10/03 09:29:47  arekm
 - rel 1
 

================================================================
Index: packages/file/automake.patch
diff -u /dev/null packages/file/automake.patch:1.1
--- /dev/null	Tue Jan 18 19:56:47 2011
+++ packages/file/automake.patch	Tue Jan 18 19:56:41 2011
@@ -0,0 +1,48 @@
+--- file-5.05/magic/Makefile.am~	2011-01-18 19:19:39.000000000 +0200
++++ file-5.05/magic/Makefile.am	2011-01-18 19:21:23.958686512 +0200
+@@ -5,11 +5,14 @@
+ MAGIC_DIR = $(top_srcdir)/magic
+ MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+ 
+-pkgdata_DATA = magic.mgc
++pkgdata_DATA = magic.mgc magic
+ 
+ EXTRA_DIST = \
+ $(MAGIC_DIR)/Header \
+ $(MAGIC_DIR)/Localstuff \
++$(MAGIC_FILES)
++
++MAGIC_FILES = \
+ $(MAGIC_FRAGMENT_DIR)/acorn \
+ $(MAGIC_FRAGMENT_DIR)/adi \
+ $(MAGIC_FRAGMENT_DIR)/adventure \
+@@ -236,8 +239,9 @@
+ $(MAGIC_FRAGMENT_DIR)/dump \
+ $(MAGIC_FRAGMENT_DIR)/zyxel 
+ 
+-MAGIC = magic.mgc
+-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
++MAGIC = magic
++MAGIC_MGC = magic.mgc
++CLEANFILES = $(MAGIC) $(MAGIC_MGC) $(MAGIC_FRAGMENT_DIR)/Localstuff
+ 
+ # FIXME: Build file natively as well so that it can be used to compile
+ # the target's magic file
+@@ -253,8 +253,12 @@
+ FILE_COMPILE_DEP = $(FILE_COMPILE)
+ endif
+ 
+-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
+-	@rm -fr magic
+-	@mkdir magic && cp -p $(EXTRA_DIST) magic
+-	$(FILE_COMPILE) -C -m magic
+-	@rm -fr magic
++$(MAGIC): $(MAGIC_DIR)/Header $(MAGIC_FILES)
++	cat $(MAGIC_DIR)/Header $(MAGIC_FILES) > $@
++
++$(MAGIC_MGC): $(MAGIC) $(FILE_COMPILE_DEP)
++	$(FILE_COMPILE) -C -m $<
++
++install-data-local:
++	install -d $(DESTDIR)$(sysconfdir)
++	cp -p $(MAGIC_DIR)/Localstuff $(DESTDIR)$(sysconfdir)/magic

================================================================
Index: packages/file/searchpath.patch
diff -u /dev/null packages/file/searchpath.patch:1.1
--- /dev/null	Tue Jan 18 19:56:47 2011
+++ packages/file/searchpath.patch	Tue Jan 18 19:56:41 2011
@@ -0,0 +1,23 @@
+still search in /etc/magic
+still use ~/.magic by default
+
+--- file-5.04/src/Makefile.am	2010-07-21 18:56:10.000000000 +0300
++++ file-5.04/src/Makefile.am	2010-12-23 13:27:13.810960488 +0200
+@@ -4,7 +4,7 @@
+ 
+ bin_PROGRAMS = file
+ 
+-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
++AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
+ AM_CFLAGS = @WARNINGS@
+ 
+ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+--- file-5.04/src/magic.c~	2009-09-14 20:50:38.000000000 +0300
++++ file-5.04/src/magic.c	2010-09-20 17:14:49.000000000 +0300
+@@ -84,5 +89,5 @@
+ private const char *
+ get_default_magic(void)
+ {
+-	static const char hmagic[] = "/.magic/magic.mgc";
++	static const char hmagic[] = "/.magic";
+ 	static char default_magic[2 * MAXPATHLEN + 2];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.173&r2=1.174&f=u

More information about the pld-cvs-commit mailing list