[packages/geninitrd] - dropped PLD Ti patches and %ifs

[hawk]

commit 35f98152f62b0aeae2fb224820d1da3ae0f68a65
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Thu Apr 18 10:14:30 2013 +0000

    - dropped PLD Ti patches and %ifs

 geninitrd-gzip-compressor.patch | 24 ------------------------
 geninitrd-romfs.patch           | 15 ---------------
 geninitrd.spec                  | 17 +++--------------
 3 files changed, 3 insertions(+), 53 deletions(-)
---
diff --git a/geninitrd.spec b/geninitrd.spec
index 75f1d78..0405231 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -12,10 +12,8 @@ License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	bd47ea3ca6dbeea39af6bc5eb1d12e5a
-Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-gzip-compressor.patch
-# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12585:HEAD > geninitrd-svn.patch
-Patch2:		%{name}-svn.patch
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12639:HEAD > geninitrd-svn.patch
+Patch0:		%{name}-svn.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	/usr/bin/ldd
@@ -32,15 +30,10 @@ Requires:	pci-database >= 0.4
 Requires:	rc-scripts >= 0.2.7
 Requires:	tar
 Requires:	virtual(module-tools)
-%if "%{pld_release}" == "ti"
-Requires:	lvm2-initrd
-Requires:	mdadm-initrd >= 1.12.0-1
-%else
 # otherwise LVM subsystem is not enabled in geninitrd
 Suggests:	lvm2-initrd
 # without this softraid installations of PLD fail
 Suggests:	mdadm-initrd >= 1.12.0-1
-%endif
 Suggests:	genromfs
 Suggests:	pciutils
 # suggest for blkid
@@ -94,11 +87,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
-%patch0 -p1
-%patch1 -p1
-%endif
-#%patch2 -p0
+#%patch0 -p0
 
 %build
 %{__make}
diff --git a/geninitrd-gzip-compressor.patch b/geninitrd-gzip-compressor.patch
deleted file mode 100644
index 72e13f7..0000000
--- a/geninitrd-gzip-compressor.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur geninitrd-10000.18.orig/geninitrd geninitrd-10000.18/geninitrd
---- geninitrd-10000.18.orig/geninitrd	2009-08-31 21:31:46.000000000 +0200
-+++ geninitrd-10000.18/geninitrd	2009-09-19 22:40:21.932301167 +0200
-@@ -795,6 +795,8 @@
- 	# a specified one, take it
- 	if ! is_yes "$mode"; then
- 		compressors="$mode"
-+	else
-+		compressors="gzip"
- 	fi
- 
- 	debug "finding compressor: $compressors (via $mode)"
-diff -ur geninitrd-10000.18.orig/geninitrd.sysconfig geninitrd-10000.18/geninitrd.sysconfig
---- geninitrd-10000.18.orig/geninitrd.sysconfig	2009-08-31 21:31:46.000000000 +0200
-+++ geninitrd-10000.18/geninitrd.sysconfig	2009-09-19 22:41:49.252501100 +0200
-@@ -9,7 +9,7 @@
- 
- ## Compression for the initrd.
- ## xz / lzma / bzip2 / gzip / lzo.
--## yes (default) = the 'best' available is chosen.
-+## yes = gzip (for backward compatibility)
- #COMPRESS=yes
- 
- ## What filesystem to use (rom or ext2)?
diff --git a/geninitrd-romfs.patch b/geninitrd-romfs.patch
deleted file mode 100644
index 42435c0..0000000
--- a/geninitrd-romfs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- geninitrd-10000.10/geninitrd~	2009-04-06 18:12:27.000000000 +0300
-+++ geninitrd-10000.10/geninitrd	2009-04-06 18:13:33.882133693 +0300
-@@ -948,11 +948,7 @@
- 	fi
- 
- 	# default value
--	if [ "$kernel_version" -ge "002005" ]; then
--		INITRDFS="initramfs"
--	else
--		INITRDFS="rom"
--	fi
-+	INITRDFS="rom"
- fi
- 
- case "$INITRDFS" in
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geninitrd.git/commitdiff/35f98152f62b0aeae2fb224820d1da3ae0f68a65