replace patch with external file

diff --git a/fstab b/fstab
new file mode 100644 (file)
index 0000000..9794c55
--- /dev/null
+++ b/fstab
@@ -0,0 +1,2 @@
+none   /proc           proc    defaults                0 0
+none   /dev/pts        devpts  gid=5,mode=620          0 0

diff --git a/remove-tmpfs.patch b/remove-tmpfs.patch
deleted file mode 100644 (file)
index cf98f1a..0000000
--- a/remove-tmpfs.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -ur util-vserver-0.30.216-pre2883.orig/distrib/misc/fstab util-vserver-0.30.216-pre2883/distrib/misc/fstab
---- util-vserver-0.30.216-pre2883.orig/distrib/misc/fstab      2010-03-31 09:54:20.000000000 -0400
-+++ util-vserver-0.30.216-pre2883/distrib/misc/fstab   2010-06-01 16:20:06.960012010 -0400
-@@ -1,3 +1,2 @@
- none  /proc           proc    defaults                0 0
--none  /tmp            tmpfs   size=16m,mode=1777      0 0
- none  /dev/pts        devpts  gid=5,mode=620          0 0

diff --git a/util-vserver.spec b/util-vserver.spec
index c618870..6a8da13 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -36,10 +36,9 @@ License:     GPL
 Group:         System Environment/Base
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2
-#Source1:      http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2.asc
+Source1:       fstab
 Patch1:                f12.patch
-Patch2:                remove-tmpfs.patch
-Patch3:                f13.patch
+Patch2:                f13.patch
 BuildRoot:     %_tmppath/%name-%version-%release-root
 Requires:      init(%name)
 Requires:      %name-core = %version-%release
@@ -199,7 +198,6 @@ Linux-VServer API from Python.
 %setup -q -n %name-%fullver
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 autoreconf -fi
 
 %build
@@ -223,6 +221,7 @@ MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
 contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 
+install -c -m 755 %{SOURCE1} %{buildroot}/%pkglibdir/defaults/fstab
 
 %check
 %__make check