rpms/dmraid/devel dmraid-1.0.0.rc11-dupes.patch, NONE, 1.1 dmraid.spec, 1.56, 1.57

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7039

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-dupes.patch 
Log Message:
- fix dupes of asc.c in makefile rule
- fix make install/file list descrepencies


dmraid-1.0.0.rc11-dupes.patch:
 Makefile.in |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE dmraid-1.0.0.rc11-dupes.patch ---
--- dmraid/1.0.0.rc11/lib/Makefile.in.dupes	2006-07-28 16:13:29.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/Makefile.in	2006-07-28 16:14:19.000000000 -0400
@@ -35,7 +35,6 @@
 	format/ataraid/pdc.c \
 	format/ataraid/sil.c \
 	format/ataraid/via.c \
-	format/ataraid/asr.c \
 	format/partition/dos.c
 
 OBJECTS=$(SOURCES:%.c=%.o)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- dmraid.spec	28 Jul 2006 20:10:35 -0000	1.56
+++ dmraid.spec	28 Jul 2006 20:19:06 -0000	1.57
@@ -17,6 +17,7 @@
 Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
 Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
 Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
+Patch3: dmraid-1.0.0.rc11-dupes.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -38,6 +39,7 @@
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2
 
 %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
@@ -59,6 +61,8 @@
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +84,7 @@
 * Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.2
 - Fix bounds checking on hpt37x error log
 - Only build the .so, not the .a
+- Fix asc.c duplication in makefile rule
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc11-FC6.1.1
 - rebuild