- use gzip as compressor in Titanium unless user has specified otherwise

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 5891defa00ecbde2a3c65c342cda07574ce2df9d..0949ec5c2223b33c35dad07960ee538f12a6e12a 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,31 +1,39 @@
 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:       10000.1
+Version:       10000.18
 # leave rel 1 for ac
-Release:       2
+Release:       7
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 4a182f0cc43d670800f6f704bd1deaa5
+# Source0-md5: b3b0acb344ae8852cf30672370c81888
+Patch0:                %{name}-romfs.patch
+Patch1:                %{name}-gzip-compressor.patch
+Patch2:                %{name}-lzma.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      awk
-Requires:      busybox-initrd >= 1.00-0.rc3.2
+Requires:      busybox-initrd > 1.00-4
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
 Requires:      genromfs
 Requires:      gzip
-Requires:      rc-scripts >= 0.2.7
-# without this softraid installations of PLD fail
-Requires:      mdadm-initrd >= 1.12.0-1
+Requires:      /usr/bin/ldd
 Requires:      mktemp >= 1.5-8
 Requires:      module-init-tools >= 3.2.2-6
 Requires:      mount
 Requires:      pci-database >= 0.4
+Requires:      rc-scripts >= 0.2.7
 Requires:      tar
+# otherwise LVM subsystem is automatically disabled in geninitrd
+Suggests:      lvm2-initrd
+# without this softraid installations of PLD fail
+Suggests:      mdadm-initrd >= 1.12.0-1
 Obsoletes:     mkinitrd
+Conflicts:     grubby < 6.0.24-3
 Conflicts:     udev-initrd < 1:104
+Conflicts:     xz < 4.999.9
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -62,6 +70,11 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
+%if "%{pld_release}" == "ti"
+%patch0 -p1
+%patch1 -p1
+%endif
+%patch2 -p0
 
 %build
 %{__make}
@@ -80,8 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/geninitrd
 %attr(755,root,root) /sbin/geninitrd
-%{_mandir}/man8/*
+%{_mandir}/man8/geninitrd.8*
 
-%dir %{_sysconfdir}/geninitrd
-%{_sysconfdir}/geninitrd/functions
-%{_sysconfdir}/geninitrd/mod-*.sh
+%dir /lib/geninitrd
+/lib/geninitrd/functions
+/lib/geninitrd/mod-*.sh