SPECS: dmraid.spec - added fix, optflags patches, build shared library

qboosh qboosh at pld-linux.org
Tue May 23 00:42:35 CEST 2006


Author: qboosh                       Date: Mon May 22 22:42:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added fix,optflags patches, build shared library

---- Files affected:
SPECS:
   dmraid.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.25 SPECS/dmraid.spec:1.26
--- SPECS/dmraid.spec:1.25	Thu May 18 22:07:01 2006
+++ SPECS/dmraid.spec	Tue May 23 00:42:30 2006
@@ -15,6 +15,8 @@
 Source0:	http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
 # Source0-md5:	0206f8166bfdc370c4ee8efcb35af111
 Patch0:		%{name}-selinux-static.patch
+Patch1:		%{name}-fix.patch
+Patch2:		%{name}-optflags.patch
 URL:		http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -25,9 +27,6 @@
 %{?with_initrd:BuildRequires:	libsepol-static}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_x86_64	-fPIC
-%define		specflags_amd64	-fPIC
-
 %description
 DMRAID supports device discovery, set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
@@ -81,6 +80,8 @@
 %setup -q -n %{name}
 mv */* ./
 %patch0 -p2
+%patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -90,41 +91,44 @@
 %if %{with initrd}
 %configure \
 	--enable-static_link
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+%{__make}
 cp -f tools/dmraid{,-initrd}
 %{__make} clean
 %endif
 
-%configure
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+%configure \
+	--enable-shared_lib
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D tools/dmraid $RPM_BUILD_ROOT%{_sbindir}/dmraid
-%{?with_initrd:install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd}
-install -D man/dmraid.8 $RPM_BUILD_ROOT%{_mandir}/man8/dmraid.8
-
-install -d $RPM_BUILD_ROOT{%{_includedir}/dmraid,%{_libdir}}
-install include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid
-# install the static library
-install lib/libdmraid.a $RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+	includedir=$RPM_BUILD_ROOT%{_includedir} \
+	libdir=$RPM_BUILD_ROOT%{_libdir} \
+	mandir=$RPM_BUILD_ROOT%{_mandir} \
+	sbindir=$RPM_BUILD_ROOT%{_sbindir}
+
+%if %{with initrd}
+install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc README TODO doc/dmraid_design.txt
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/dmraid
+%attr(755,root,root) %{_libdir}/libdmraid.so.*.*.*
 %{_mandir}/man8/*
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdmraid.so
 %{_includedir}/dmraid
 
 %files static
@@ -134,7 +138,7 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/dmraid-initrd
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -143,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/05/22 22:42:30  qboosh
+- added fix,optflags patches, build shared library
+
 Revision 1.25  2006/05/18 20:07:01  glen
 - build with -fPIC on x86_64/amd64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dmraid.spec?r1=1.25&r2=1.26&f=u



More information about the pld-cvs-commit mailing list