packages: file/automake.patch, file/file.spec - handle extra addons via fil...

glen glen at pld-linux.org
Sun Aug 7 16:01:20 CEST 2011


Author: glen                         Date: Sun Aug  7 14:01:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- handle extra addons via file own makefiles

---- Files affected:
packages/file:
   automake.patch (1.2 -> 1.3) , file.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: packages/file/automake.patch
diff -u packages/file/automake.patch:1.2 packages/file/automake.patch:1.3
--- packages/file/automake.patch:1.2	Fri Aug  5 10:24:11 2011
+++ packages/file/automake.patch	Sun Aug  7 16:01:15 2011
@@ -1,5 +1,5 @@
---- 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
+--- file-5.08/magic/Makefile.am	2011-08-07 13:28:39.719588222 +0300
++++ file-5.08/magic/Makefile.am	2011-08-07 16:53:54.377119273 +0300
 @@ -5,11 +5,14 @@
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -16,8 +16,19 @@
  $(MAGIC_FRAGMENT_DIR)/acorn \
  $(MAGIC_FRAGMENT_DIR)/adi \
  $(MAGIC_FRAGMENT_DIR)/adventure \
-@@ -236,8 +239,9 @@
- $(MAGIC_FRAGMENT_DIR)/dump \
+@@ -135,6 +138,7 @@
+ $(MAGIC_FRAGMENT_DIR)/modem \
+ $(MAGIC_FRAGMENT_DIR)/motorola \
+ $(MAGIC_FRAGMENT_DIR)/mozilla \
++$(MAGIC_FRAGMENT_DIR)/mscompress \
+ $(MAGIC_FRAGMENT_DIR)/msdos \
+ $(MAGIC_FRAGMENT_DIR)/msooxml \
+ $(MAGIC_FRAGMENT_DIR)/msvc \
+@@ -238,10 +242,12 @@
+ $(MAGIC_FRAGMENT_DIR)/xo65 \
+ $(MAGIC_FRAGMENT_DIR)/xwindows \
+ $(MAGIC_FRAGMENT_DIR)/zilog \
++$(MAGIC_FRAGMENT_DIR)/zisofs \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
 -MAGIC = magic.mgc
@@ -27,8 +38,8 @@
 +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
-@@ -257,9 +257,10 @@
+ # the target's magic file; for now we bail if the local version does not match
+@@ -253,9 +259,10 @@
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
@@ -42,10 +53,7 @@
  	@(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
+@@ -271 +278,4 @@
 -	@rm -fr magic
 +
 +install-data-local:

================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.187 packages/file/file.spec:1.188
--- packages/file/file.spec:1.187	Sun Aug  7 15:51:24 2011
+++ packages/file/file.spec	Sun Aug  7 16:01:15 2011
@@ -260,6 +260,9 @@
 %{__sed} -i -e 's,-Wextra,,' configure.ac
 %endif
 
+cp -p %{SOURCE3} magic/Magdir/mscompress
+cp -p %{SOURCE2} magic/Magdir/zisofs
+
 rm -f magic/Magdir/{*.orig,*~}
 
 %build
@@ -304,10 +307,6 @@
 %py_postclean
 %endif
 
-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
 ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -385,6 +384,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2011/08/07 14:01:15  glen
+- handle extra addons via file own makefiles
+
 Revision 1.187  2011/08/07 13:51:24  glen
 - drop greedy dump patch, it has no effect since r1.143 (4.24-2) as files are concat by .spec
 
================================================================

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



More information about the pld-cvs-commit mailing list