packages: file/automake.patch, file/file.spec - up to 5.08

[glen]

Author: glen                         Date: Fri Aug  5 08:24:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.08

---- Files affected:
packages/file:
   automake.patch (1.1 -> 1.2) , file.spec (1.184 -> 1.185) 

---- Diffs:

================================================================
Index: packages/file/automake.patch
diff -u packages/file/automake.patch:1.1 packages/file/automake.patch:1.2
--- packages/file/automake.patch:1.1	Tue Jan 18 19:56:41 2011
+++ packages/file/automake.patch	Fri Aug  5 10:24:11 2011
@@ -1,5 +1,5 @@
---- 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
+--- file-5.08/magic/Makefile.am~	2011-08-05 11:08:41.000000000 +0300
++++ file-5.08/magic/Makefile.am	2011-08-05 11:15:46.431552516 +0300
 @@ -5,11 +5,14 @@
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -28,20 +28,25 @@
  
  # FIXME: Build file natively as well so that it can be used to compile
  # the target's magic file
-@@ -253,8 +253,12 @@
+@@ -257,9 +257,10 @@
  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 $<
+ 	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
+ 	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
+ 	  else \
+@@ -272,4 +273,7 @@
+ 	    fi; \
+ 	  fi)
+ 	$(FILE_COMPILE) -C -m magic
+-	@rm -fr magic
 +
 +install-data-local:
 +	install -d $(DESTDIR)$(sysconfdir)

================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.184 packages/file/file.spec:1.185
--- packages/file/file.spec:1.184	Thu May 26 08:49:34 2011
+++ packages/file/file.spec	Fri Aug  5 10:24:11 2011
@@ -29,18 +29,18 @@
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.07
-Release:	3
+Version:	5.08
+Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	b8d1f9a8a644067bd0a703cebf3f4858
+# Source0-md5:	6a2a263c20278f01fe3bb0f720b27d4e
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
 Source3:	%{name}-mscompress.magic
 Source4:	%{name}-magic.mime-gen.awk
-Patch0:		git.patch
+#Patch0:		git.patch
 Patch1:		%{name}-sparc.patch
 Patch3:		%{name}-greedy-dump.patch
 Patch4:		%{name}-selinux.patch
@@ -249,7 +249,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
@@ -258,7 +258,7 @@
 %patch9 -p1
 %patch10 -p1
 
-%if "%{cc_release}" < "3.4"
+%if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
 %endif
 
@@ -311,13 +311,12 @@
 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
 
-src/file -m $RPM_BUILD_ROOT%{_datadir}/misc/magic -c -C
+./src/file -m $RPM_BUILD_ROOT%{_datadir}/misc/magic -c -C
 ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
-rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
-
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -390,6 +389,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2011/08/05 08:24:11  glen
+- up to 5.08
+
 Revision 1.184  2011/05/26 06:49:34  glen
 - ln -n for symlink
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/automake.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.184&r2=1.185&f=u