SPECS (DEVEL): geninitrd.spec - kill prereq, dmraid patch is prett...

[glen]

Author: glen                         Date: Sun Oct 23 11:37:15 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- kill prereq, dmraid patch is pretty usable (dropped bcond)
- adapterized

---- Files affected:
SPECS:
   geninitrd.spec (2.61.2.2 -> 2.61.2.3) 

---- Diffs:

================================================================
Index: SPECS/geninitrd.spec
diff -u SPECS/geninitrd.spec:2.61.2.2 SPECS/geninitrd.spec:2.61.2.3
--- SPECS/geninitrd.spec:2.61.2.2	Mon Oct 17 11:00:10 2005
+++ SPECS/geninitrd.spec	Sun Oct 23 13:37:10 2005
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	dmraid	# include partial ugly hack for dmraid. do not use!
-#
 Summary:	Creates an initial ramdisk image for preloading modules
 Summary(pl):	Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:		geninitrd
@@ -13,9 +9,8 @@
 #Source0:	ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	8f65df11eec0a97d4e550916ccbde4ce
-Patch2:		%{name}-dmraid.patch
+Patch0:		%{name}-dmraid.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
-PreReq:		rc-scripts >= 0.2.7
 Requires:	awk
 Requires:	busybox-initrd >= 1.00-0.rc3.2
 Requires:	fileutils
@@ -26,6 +21,7 @@
 Requires:	mktemp >= 1.5-8
 Requires:	mount
 Requires:	pci-database >= 0.4
+Requires:	rc-scripts >= 0.2.7
 Requires:	sh-utils
 Requires:	tar
 Obsoletes:	mkinitrd
@@ -33,9 +29,10 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Geninitrd creates filesystem images for use as initial ramdisk (initrd)
-images. These ramdisk images are often used to preload the block
-device modules (SCSI or RAID) needed to access the root filesystem.
+Geninitrd creates filesystem images for use as initial ramdisk
+(initrd) images. These ramdisk images are often used to preload the
+block device modules (SCSI or RAID) needed to access the root
+filesystem.
 
 In other words, generic kernels can be built without drivers for any
 SCSI adapters which load the SCSI driver as a module. Since the kernel
@@ -64,7 +61,7 @@
 
 %prep
 %setup -q
-%{?with_dmraid:%patch2 -p1}
+%patch0 -p1
 
 %build
 rm geninitrd.8
@@ -83,7 +80,7 @@
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) /sbin/geninitrd
-%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/geninitrd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/geninitrd
 %{_mandir}/man8/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -92,6 +89,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.61.2.3  2005/10/23 11:37:10  glen
+- kill prereq, dmraid patch is pretty usable (dropped bcond)
+- adapterized
+
 Revision 2.61.2.2  2005/10/17 09:00:10  glen
 - patch{0,1} already in svn
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/geninitrd.spec?r1=2.61.2.2&r2=2.61.2.3&f=u