dmraid:

- update to 1.0.0.rc16
- update patches from fedora package
- add BR: libudev-static, device-mapper-static, glibc-static
- add BR: device-mapper-event-devel
- add -events, -events-logwatch subpackage
- move libdmraid.so to main package
- use %ghost for /var/lock/dmraid



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3308 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dmraid/dmraid-vl.spec

@@ -1,19 +1,35 @@
 Summary: Device-mapper RAID tool and library.
 Summary(ja): Device-mapper RAID ツールおよびライブラリ
 Name: dmraid
-Version: 1.0.0.rc15
+Version: 1.0.0.rc16
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
-Patch0: dmraid-1.0.0.rc15-whitespace.patch
+Patch0: dmraid-1.0.0.rc16-test_devices.patch
-Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
+Patch1: ddf1_lsi_persistent_name.patch
-Patch2: dmraid-1.0.0.rc15-rm_partitions.patch
+Patch2: pdc_raid10_failure.patch
+Patch3: return_error_wo_disks.patch
+Patch4: fix_sil_jbod.patch
+Patch5: avoid_register.patch
+Patch6: move_pattern_file_to_var.patch
+Patch7: libversion.patch
+Patch8: libversion-display.patch
+Patch9: bz635995-data_corruption_during_activation_volume_marked_for_rebuild.patch
+Patch11: bz626417_19-enabling_registration_degraded_volume.patch
+Patch12: bz626417_20-cleanup_some_compilation_warning.patch
+Patch13: bz626417_21-add_option_that_postpones_any_metadata_updates.patch
+
+Patch100: dmraid-1.0.0.rc16-libudev.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: device-mapper-devel >= 1.02.22
+BuildRequires: device-mapper-event-devel
+BuildRequires: device-mapper-static
+BuildRequires: libudev-static
+BuildRequires: glibc-static
 Requires: device-mapper >= 1.02.22
 Requires(postun): ldconfig
 Requires(post): ldconfig
@@ -30,11 +46,44 @@ Group: Development/Libraries
 dmraid-devel provides a library interface for RAID device discovery,
 RAID set activation and display of properties for ATARAID volumes.
 
+%package -n dmraid-events
+Summary: dmevent_tool (Device-mapper event tool) and DSO
+Group: System Environment/Base
+Requires: dmraid = %{version}-%{release}, sgpio
+Requires: device-mapper-event
+
+%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
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch100 -p1
 
 %build
 %configure \
@@ -54,16 +103,34 @@ 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,%{_sysconfdir}/cron.d/}
+install -m 755 -d $RPM_BUILD_ROOT{%{_sysconfdir}/logwatch/conf/services/,%{_sysconfdir}/logwatch/scripts/services/,/var/cache/logwatch/dmeventd}
 make DESTDIR=$RPM_BUILD_ROOT install
 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)
+(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+
+#
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# if requested, install the dso
+# Install the libdmraid and libdmraid-events (for dmeventd) DSO
+# Create version symlink to libdmraid.so.1 we link against
 install -m 755 lib/libdmraid.so \
-	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
+        $RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
-(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
+(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so ; ln -sf libdmraid.so.%{version} libdmraid.so.1)
-
+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 ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so.1)
+		 
+# Install logwatch config file and script for dmeventd
+install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT%{_sysconfdir}/logwatch/conf/services/dmeventd.conf
+install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT%{_sysconfdir}/logwatch/scripts/services/dmeventd
+install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/dmeventd-logwatch
+install -m 0700 /dev/null $RPM_BUILD_ROOT/var/cache/logwatch/dmeventd/syslogpattern.txt
+
+# remove static libs
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
 %clean
@@ -78,16 +145,40 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
 %{_mandir}/man8/*
 /sbin/*
-%{_libdir}/libdmraid.so.*
+%{_libdir}/libdmraid.so*
-/var/lock/dmraid
+%{_libdir}/libdmraid-events-isw.so*
+%ghost /var/lock/dmraid
 
 %files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
 %{_includedir}/dmraid/*
-%{_libdir}/libdmraid.so
+
+%files -n dmraid-events
+%defattr(-,root,root)
+/%{_mandir}/man8/dmevent_tool*
+/%{_mandir}/man8/dm_dso_reg_tool*
+/sbin/dmevent_tool
+/sbin/dm_dso_reg_tool
+
+%files -n dmraid-events-logwatch
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/logwatch/*
+%config(noreplace) %{_sysconfdir}/cron.d/dmeventd-logwatch
+%dir /var/cache/logwatch/dmeventd
+%ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
+
 
 %changelog
+* Tue Apr 05 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.0.rc16-1
+- update to 1.0.0.rc16
+- update patches from fedora package
+- add BR: libudev-static, device-mapper-static, glibc-static
+- add BR: device-mapper-event-devel
+- add -events, -events-logwatch subpackage
+- move libdmraid.so to main package
+- use %ghost for /var/lock/dmraid
+
 * Sat Mar 28 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.0.rc15-1
 - new upstream release