- drop patches that do nothing in recent build system

- create the text magic file during installation
This commit is contained in:
Tomas Smetana 2008-06-04 05:42:07 +00:00
parent 683dc83b66
commit 4f1860c98f
2 changed files with 26 additions and 3 deletions

23
file-4.24-oracle.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up file-4.24/magic/Magdir/filesystems.orig file-4.24/magic/Magdir/filesystems
--- file-4.24/magic/Magdir/filesystems.orig 2008-02-19 18:27:29.000000000 +0100
+++ file-4.24/magic/Magdir/filesystems 2008-06-03 15:34:34.000000000 +0200
@@ -1266,6 +1266,19 @@
>>>2 short 2048 AXP generated)
>>>2 short 4096 I64 generated)
+# Oracle Clustered Filesystem - Aaron Botsis <redhat@digitalmafia.org>
+8 string OracleCFS Oracle Clustered Filesystem,
+>4 long x rev %d
+>0 long x \b.%d,
+>560 string x label: %.64s,
+>136 string x mountpoint: %.128s
+
+# Oracle ASM tagged volume - Aaron Botsis <redhat@digitalmafia.org>
+32 string ORCLDISK Oracle ASM Volume,
+>40 string x Disk Name: %0.12s
+32 string ORCLCLRD Oracle ASM Volume (cleared),
+>40 string x Disk Name: %0.12s
+
# Compaq/HP RILOE floppy image
# From: Dirk Jagdmann <doj@cubic.org>
0 string CPQRFBLO Compaq/HP RILOE floppy image

View File

@ -11,7 +11,7 @@ Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
URL: http://www.darwinsys.com/file/
Patch1: file-4.24-selinux.patch
Patch2: file-4.21-oracle.patch
Patch2: file-4.24-oracle.patch
Patch3: file-4.24-ELF.patch
patch4: file-4.24-efi.patch
patch5: file-4.21-pybuild.patch
@ -136,11 +136,11 @@ rm -rf $RPM_BUILD_ROOT
%doc python/README COPYING python/example.py
%{python_sitearch}/magic.so
%if 0%{?fedora} >= 9
#%{python_sitearch}/*egg-info
%{python_sitearch}/*egg-info
%endif
%changelog
* Tue Jun 03 2008 Tomas Smetana <tsmetana@redhat.com>
* Wed Jun 04 2008 Tomas Smetana <tsmetana@redhat.com> - 4.24-3
- drop patches that do nothing in recent build system
- create the text magic file during installation