rpms/dmraid/F-11 dmraid.spec,1.95,1.96

Wed Sep 16 10:31:40 UTC 2009

Author: mauelsha

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

Modified Files:
	dmraid.spec 
Log Message:
Update to 1.0.0.rc16 with event logging


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96

--- dmraid.spec	16 Sep 2009 10:29:43 -0000	1.95
+++ dmraid.spec	16 Sep 2009 10:31:37 -0000	1.96
@@ -1,18 +1,19 @@
-Summary: Device-mapper RAID tool and library
+#
+# Copyright (C)  Heinz Mauelshagen, 2004-2009 Red Hat GmbH. All rights reserved.
+#
+# See file LICENSE at the top of this source tree for license information.
+#
+
+Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
-Version: 1.0.0.rc15
-Release: 7%{?dist}
+Version: 1.0.0.rc16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-Patch0: dmraid-1.0.0.rc15-whitespace.patch
-Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
-Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
-Patch3: dmraid-1.0.0.rc15-isw-serial.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
-Requires: kpartx
-Requires: device-mapper >= 1.02.02-2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
+Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
@@ -22,78 +23,113 @@ DMRAID supports RAID device discovery, R
 removal, rebuild and display of properties for ATARAID/DDF1 metadata on
 Linux >= 2.4 using device-mapper.
 
-%package devel
-Summary: Development libraries and headers for dmraid
+%package -n dmraid-devel
+Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
 License: GPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
-%description devel
+%description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
-RAID set activation, creation, removal, rebuild and display of
-properties for ATARAID/DDF1 metadata.
+RAID set activation and display of properties for ATARAID volumes.
 
-%package libs
-Summary: Shared library for RAID device discovery
-Group: System Environment/Libraries
-License: GPLv2+
+%package -n dmraid-events
+Summary: dmevent_tool (Device-mapper event tool) and DSO
+Group: System Environment/Base
+Requires: dmraid = %{version}-%{release}, sgpio
 
-%description libs
-This package contains the dmraid shared library, libdmraid.
+%description -n dmraid-events
+Provides a dmeventd DSO and the dmevent_tool to register devices with it
+for device monitoring.  All active RAID sets should be manually registered
+with dmevent_tool.
+
+%package -n dmraid-events-logwatch
+Summary: dmraid logwatch-based email reporting
+Group: System Environment/Base
+Requires: dmraid-events = %{version}-%{release}, logwatch, /etc/cron.d
+
+%description -n dmraid-events-logwatch
+Provides device failure reporting via logwatch-based email reporting.
+Device failure reporting has to be activated manually by activating the 
+/etc/cron.d/dmeventd-logwatch entry and by calling the dmevent_tool
+(see manual page for examples) for any active RAID sets.
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -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 --disable-static_link
+%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
 make DESTDIR=$RPM_BUILD_ROOT
-make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid}
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
-ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Install static dmraid binary
+install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
+
+# Provide convenience link from dmevent_tool
+(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# if requested, install the dso
+# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
+install -m 755 lib/libdmraid-events-isw.so \
+	$RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
+(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so)
+
+# Install logwatch config file and script for dmeventd
+install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
+install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
+install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
+install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
- 
-%postun libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
-/%{_mandir}/man8/dmraid.8.gz
+/%{_mandir}/man8/dmraid*
 /sbin/dmraid
 /sbin/dmraid.static
+%{_libdir}/libdmraid.so*
+%{_libdir}/libdmraid-events-isw.so*
 /var/lock/dmraid
 
-%files devel
+%files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
-%{_includedir}/dmraid/*.h
-%attr(755,root,root) %{_libdir}/libdmraid.so
+%{_includedir}/dmraid/*
 
-%files libs
-%attr(755,root,root) %{_libdir}/libdmraid.so.*
+%files -n dmraid-events
+%defattr(-,root,root)
+/%{_mandir}/man8/dmevent_tool*
+/sbin/dmevent_tool
+/sbin/dm_dso_reg_tool
+
+%files -n dmraid-events-logwatch
+%defattr(-,root,root)
+%config(noreplace) /etc/logwatch/*
+%config(noreplace) /etc/cron.d/dmeventd-logwatch
+%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
-* Thu Sep 11 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
+* Thu Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16
 
 * Fri Apr 17 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-7


