Hello community, here is the log from the commit of package smartmontools checked in at Fri Aug 24 02:05:46 CEST 2007. -------- --- smartmontools/smartmontools.changes 2007-07-25 14:58:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/smartmontools/smartmontools.changes 2007-08-22 13:17:31.929842000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 22 13:14:42 CEST 2007 - sbrabec@suse.cz + +- Worked around missing %restart_on_update in older versions. +- Build correctly in older SuSE versions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.l30131/_old 2007-08-24 02:05:14.000000000 +0200 +++ /var/tmp/diff_new_pack.l30131/_new 2007-08-24 02:05:14.000000000 +0200 @@ -15,7 +15,7 @@ Group: Hardware/Other Autoreqprov: on Version: 5.37 -Release: 1 +Release: 9 Source: %{name}-%{version}.tar.bz2 Source1: README.SATA Patch: smartmontools-powersave-notify.patch @@ -25,7 +25,7 @@ Patch4: smartmontools-command-convert.patch Patch5: smartmontools-command-convert2.patch Patch6: smartmontools-lsb-init-script.patch -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq coreutils %if %suse_version > 1000 Requires: powersave %endif @@ -33,6 +33,9 @@ Requires: licenses BuildRequires: licenses %endif +%if %suse_version < 1000 +BuildRequires: kernel-source +%endif URL: http://smartmontools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ libstdc++-devel @@ -42,15 +45,15 @@ %description SMARTmontools controls and monitors storage devices using the Self-Monitoring, Analysis, and Reporting Technology System (S.M.A.R.T.) -built into ATA, SATA and SCSI Hard Drives. This is used to check hard -drive reliability and to predict drive failures. The suite contains -two utilities. The first, smartctl, is a command line utility designed -to perform simple S.M.A.R.T. tasks. The second, smartd, is a daemon -that periodically monitors smart status and reports errors to syslog. -The package is compatible with the ATA/ATAPI-3 to -7 specification. -The package is intended to incorporate as much "vendor specific" and -"reserved" information as possible about disk drives. The commands man -smartctl and man smartd will provide more information. +built into ATA, SATA and SCSI Hard Drives. This is used to check the +hard drive reliability and to predict drive failures. The suite +contains two utilities. The first, smartctl, is a command line utility +designed to perform simple S.M.A.R.T. tasks. The second, smartd, is a +daemon that periodically monitors the smart status and reports errors +to syslog. The package is compatible with the ATA/ATAPI-3 to -7 +specification. The package is intended to incorporate as much "vendor +specific" and "reserved" information as possible about disk drives. The +commands man smartctl and man smartd will provide more information. @@ -77,9 +80,14 @@ %build AUTOMAKE="%{_bindir}/automake" ./autogen.sh +%if %suse_version >= 1000 export CFLAGS="$RPM_OPT_FLAGS -fPIE" export CXXFLAGS="$RPM_OPT_FLAGS -fPIE" export LDFLAGS="-pie" +%else +# glibc header linux/cciss_ioctl.h is broken and outdated in SLES9 (#302136). Let's use the one from kernel: +export CPPFLAGS=-I/usr/src/linux/include +%endif %configure\ --with-docdir=%{_defaultdocdir}/%{name} make %{?jobs:-j%jobs} @@ -106,8 +114,15 @@ ln -sf %{_datadir}/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING %endif -%preun -%{stop_on_removal smartd} +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +# Older SuSE versions (<=10.2) don't do restart on update. Test it and set flag. +# This file exists since smartmontools-5.37: +if ! test -f usr/share/doc/packages/smartmontools/examplescripts/Example4 ; then + touch var/adm/smartd_needs_restart +fi %post %if %suse_version < 1010 @@ -118,14 +133,19 @@ # Turn smartd on by default. %{fillup_and_insserv -f -Y smartd} %endif +# Older SuSE versions (<=10.2) don't do restart on update. Do it now. +if test -f var/adm/smartd_needs_restart ; then +rm var/adm/smartd_needs_restart +%{restart_on_update smartd} +fi + +%preun +%{stop_on_removal smartd} %postun %{restart_on_update smartd} %{insserv_cleanup} -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-, root, root) %doc %{_docdir}/%{name} @@ -139,6 +159,9 @@ %config(noreplace) %{_sysconfdir}/*.conf %changelog +* Wed Aug 22 2007 - sbrabec@suse.cz +- Worked around missing %%restart_on_update in older versions. +- Build correctly in older SuSE versions. * Tue Jul 24 2007 - sbrabec@suse.cz - Updated to version 5.37: * Rely on general SAT code instead of Linux specific. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de