- dropped PLD Ti patches and %ifs

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 5856a59722fc1f7aff5965de91302651d2161d02..04052310d359c282334c85cee10c58761070655a 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,15 +6,14 @@
 Summary:       Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
-Version:       12531
+Version:       12639
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: db1a65c1cbe43e89aab4e127dd91e36d
-Patch0:                %{name}-romfs.patch
-Patch1:                %{name}-gzip-compressor.patch
-Patch2:                %{name}-svn.patch
+# Source0-md5: bd47ea3ca6dbeea39af6bc5eb1d12e5a
+# 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
@@ -31,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
@@ -54,6 +48,7 @@ Conflicts:    grubby < 6.0.24-3
 %endif
 Conflicts:     kmod < 7-2
 Conflicts:     module-init-tools < 3.2.2-6
+Conflicts:     pciutils < 2.2.9
 Conflicts:     udev-initrd < 1:168
 Conflicts:     xz < 4.999.9
 BuildArch:     noarch
@@ -92,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}