- added static version

- still needs fix - won't work on non-selinux systems
- static version not tested
- anyone wants to include it in geninitrd? :)

Changed files:
    dmraid-selinux-static.patch -> 1.1
    dmraid.spec -> 1.7

diff --git a/dmraid-selinux-static.patch b/dmraid-selinux-static.patch
new file mode 100644 (file)
index 0000000..6e70a17
--- /dev/null
+++ b/dmraid-selinux-static.patch
@@ -0,0 +1,10 @@
+--- dmraid/tools/Makefile.in~  2005-02-21 19:36:32.912447208 +0100
++++ dmraid/tools/Makefile.in   2005-02-21 19:36:32.912447208 +0100
+@@ -38,6 +38,7 @@
+       DMRAIDLIBS += -rdynamic
+ else
+       LD_FLAGS += -static
++      DMRAIDLIBS += -lselinux
+ endif
+ 
+ .PHONY: install_dmraid_tools remove_dmraid_tools

diff --git a/dmraid.spec b/dmraid.spec
index 04be2c5a5f8464e431a6bba6336230dcc7609d5f..07b3375b642a51061d04d8bd7b7373ca39188228 100644 (file)
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -2,15 +2,17 @@ Summary:      Device-mapper RAID tool
 Summary(pl):   Narzêdzie do RAID-u opartego o device-mapper
 Name:          dmraid
 Version:       1.0.0
-Release:       0.rc5.1
+Release:       0.rc5.2
 License:       GPL
 Group:         Base
 Source0:       http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}-rc5f.tar.bz2
 # Source0-md5: 086fc75133a0fb0ffe95bd9a7fb8a52f
+Patch0:                dmraid-selinux-static.patch
 URL:           http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: device-mapper-devel
+BuildRequires: device-mapper-static
 BuildRequires: gettext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,23 +25,40 @@ DMRAID obs
 wy¶wietlanie w³a¶ciwo¶ci ATARAID-u na Linuksie >= 2.4 przy u¿yciu
 device-mappera.
 
+%package initrd
+Summary:       Device-mapper RAID tool - statically linked version
+Summary(pl):   Narzêdzie do RAID-u opartego o device-mapper - wersja statyczna
+Group:         Base
+
+%description initrd
+Static version of dmraid
+
+%description initrd -l pl
+Wersja statyczna dmraid
+
 %prep
 %setup -q -n %{name}
 mv */* ./
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
 %{__gettextize}
 %{__aclocal}
 %{__autoconf}
+%configure --enable-static_link
+%{__make}
+cp tools/dmraid{,-initrd}
 
-%configure
+%{__make} clean
+%configure 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -D tools/dmraid $RPM_BUILD_ROOT%{_sbindir}/dmraid
+install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd
 install -D man/dmraid.8 $RPM_BUILD_ROOT%{_mandir}/man8/dmraid.8
 
 %clean
@@ -50,3 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README TODO doc/dmraid_design.txt
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*
+
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) /sbin/*