rpms/nbd/devel nbd.spec,1.2,1.3

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/nbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22991

Modified Files:
	nbd.spec 
Log Message:
include nbd-client i386 in x86-64 RPM because initrd images need it



Index: nbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbd/devel/nbd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nbd.spec	13 Oct 2007 23:58:32 -0000	1.2
+++ nbd.spec	7 Nov 2007 20:14:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nbd
 Version:        2.9.7
-Release:        3%{dist}
+Release:        4%{dist}
 Summary:        Network Block Device user-space tools (TCP version)
 
 Group:          Applications/System
@@ -10,38 +10,52 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
-#Requires:       
+BuildRequires:  /usr/include/gnu/stubs-32.h
 
 %description 
 Tools for the Linux Kernel's network block device, allowing you to use
 remote block devices over a TCP/IP network.
 
-
 %prep
 %setup -q
 
-
 %build
 %configure
 make %{?_smp_mflags}
 
+# Include 32bit nbd-client on 64bit hosts because it is needed in client initrd's
+%ifarch x86_64
+  sed -i "s/SIZEOF_UNSIGNED_LONG_INT 8/SIZEOF_UNSIGNED_LONG_INT 4/" config.h
+  export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-m64/-m32}
+  # <jakub> warren: you can try compiling it with -static-libgcc, the
+  #         binary doesn't seem to be threaded and so unlikely uses 
+  #         pthread_cleanup_push/pop
+  gcc $RPM_OPT_FLAGS -static-libgcc -o nbd-client-32 nbd-client.c;
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Include 32bit nbd-client on 64bit hosts because it is needed in client initrd's
+%ifarch x86_64
+  install -m 755 nbd-client-32 $RPM_BUILD_ROOT%{_sbindir}/nbd-client-32
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc README simple_test nbd-tester-client.c cliserv.h
 %{_mandir}/man*/nbd*
 %{_bindir}/nbd-server
-%{_sbindir}/nbd-client
+%{_sbindir}/nbd-client*
 
 %changelog
+* Wed Nov 07 2007 Warren Togami <wtogami at redhat.com> 2.9.7-4
+- include nbd-client i386 in x86-64 RPM because initrd images need it
+
 * Sat Oct 13 2007 Eric Harrison <eharrison at mesd.k12.or.us> 2.9.7-3
 - add buildrequires