rpms/dmraid/F-11 Makefile.in.avoid_dmreg.o_build.patch, NONE, 1.1 dmraid.spec, 1.98, 1.99

[Heinz Mauelshagen]

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31200

Modified Files:
	dmraid.spec 
Added Files:
	Makefile.in.avoid_dmreg.o_build.patch 
Log Message:
Avoid building dmreg.o on static build

Makefile.in.avoid_dmreg.o_build.patch:
 Makefile.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE Makefile.in.avoid_dmreg.o_build.patch ---
diff --git a/lib/Makefile.in.avoid_dmreg.o_build b/lib/Makefile.in
index 25a197c..dc465bc 100644
--- a/lib/Makefile.in.avoid_dmreg.o_build
+++ b/lib/Makefile.in
@@ -8,7 +8,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES=\
+SOURCES  = \
 	activate/activate.c \
 	activate/devmapper.c \
 	device/ata.c \
@@ -43,8 +43,11 @@ SOURCES=\
 	format/ddf/ddf1_crc.c \
 	format/ddf/ddf1_cvt.c \
 	format/ddf/ddf1_dump.c \
-	format/partition/dos.c \
-	register/dmreg.c
+	format/partition/dos.c
+
+ifeq ("@STATIC_LINK@", "no")
+	SOURCES += register/dmreg.c
+endif
 
 OBJECTS=$(SOURCES:%.c=%.o)
 


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- dmraid.spec	16 Sep 2009 10:58:12 -0000	1.98
+++ dmraid.spec	16 Sep 2009 12:08:26 -0000	1.99
@@ -18,6 +18,8 @@ Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
+Patch0:	Makefile.in.arvoid_dmreg.o_build.patch
+
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@@ -27,8 +29,6 @@ Linux >= 2.4 using device-mapper.
 Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
@@ -57,13 +57,14 @@ Device failure reporting has to be activ
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 mv tools/dmraid tools/dmraid.static
 make clean
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
 %install