Hello community,
here is the log from the commit of package storage-fixup for openSUSE:Factory
checked in at 2014-12-03 22:50:10
Comparing /work/SRC/openSUSE:Factory/storage-fixup (Old)
and /work/SRC/openSUSE:Factory/.storage-fixup.new (New)
Package is storage-fixup
Changes:
--- /work/SRC/openSUSE:Factory/storage-fixup/storage-fixup.changes
2011-09-23 12:46:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.storage-fixup.new/storage-fixup.changes
2014-12-03 22:50:39.0 +0100
@@ -1,0 +2,7 @@
+Wed Nov 19 15:47:24 UTC 2014 - g...@opensuse.org
+
+- run spec-cleaner
+- add storage-fixup-config.patch with additional harddisk models
+- port to systemd
+
+---
Old:
pm.storage-fixup
rc.storage-fixup
New:
storage-fixup-config.patch
storage-fixup.service
storage-fixup.system-sleep
Other differences:
--
++ storage-fixup.spec ++
--- /var/tmp/diff_new_pack.lHZyrz/_old 2014-12-03 22:50:43.0 +0100
+++ /var/tmp/diff_new_pack.lHZyrz/_new 2014-12-03 22:50:43.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package storage-fixup (Version 0.2)
+# spec file for package storage-fixup
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,28 @@
#
-Url:http://git.kernel.org/?p=linux/kernel/git/tj/storage-fixup.git
-
Name: storage-fixup
-BuildArch: noarch
-License:BSD-3-Clause
-Group: System/Base
-Requires: bash coreutils sed hdparm smartmontools dmidecode scsi
-PreReq: %insserv_prereq
-AutoReqProv:on
Version:0.2
-Release:34
+Release:0
Summary:Storage Fixup Script
+License:BSD-3-Clause
+Group: System/Base
+Url:http://git.kernel.org/?p=linux/kernel/git/tj/storage-fixup.git
Source0:%{name}-%{version}.tar.bz2
-Source1:rc.storage-fixup
-Source2:pm.storage-fixup
+Source1:storage-fixup.service
+Source2:storage-fixup.system-sleep
+# PATCH-FEATURE-UPSTREAM storage-fixup-config.patch g...@opensuse.org -- Adds
additional harddisk models
+Patch0: storage-fixup-config.patch
+Requires: bash
+Requires: coreutils
+Requires: dmidecode
+Requires: hdparm
+Requires: scsi
+Requires: sed
+Requires: smartmontools
+%{?systemd_requires}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
#!ExclusiveArch: %ix86 ia64 x86_64
%description
@@ -40,46 +46,44 @@
settings which makes the drive unload its head frequently shortening
its lifespan.
-
-
-Authors:
-
-Tejun Heo te...@suse.de
-
%prep
-%setup
+%setup -q
+%patch0 -p1
%build
%install
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d
-install -d -m 755 $RPM_BUILD_ROOT/usr/sbin
-install -m 755 storage-fixup $RPM_BUILD_ROOT/usr/sbin/storage-fixup
-install -m 644 storage-fixup.conf $RPM_BUILD_ROOT/etc/storage-fixup.conf
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/boot.storage-fixup
-install -m 755 %{SOURCE2}
$RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/50storage-fixup
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
+install -D -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/storage-fixup.service
+install -D -p -m 755 %{SOURCE2}
%{buildroot}%{_libexecdir}/systemd/system-sleep/storage-fixup
+
+%pre
+if /usr/bin/chkconfig boot.storage-fixup 2/dev/null | grep -q on; then
+touch /run/enable_storage_fixup_service
+fi
+%service_add_pre storage-fixup.service
%post
-%{fillup_and_insserv -fy boot.storage-fixup}
+%service_add_post storage-fixup.service
+if [ -f /run/enable_storage_fixup_service ]; then
+/usr/bin/systemctl --quiet enable storage-fixup.service
+rm -f /run/enable_storage_fixup_service
+fi
%preun
-%{stop_on_removal boot.storage-fixup}
+%service_del_preun storage-fixup.service
%postun
-%{insserv_cleanup}
+%service_del_postun storage-fixup.service
%files
%defattr(-,root,root)
%doc LICENSE
-%config /etc/storage-fixup.conf
-%config /etc/init.d/boot.storage-fixup
-%dir /usr/lib/pm-utils/
-%dir /usr/lib/pm-utils/sleep.d
-/usr/lib/pm-utils/sleep.d/50storage-fixup
-/usr/sbin/storage-fixup
+%config(noreplace) %{_sysconfdir}/storage-fixup.conf
+%{_unitdir}/storage-fixup.service
+%dir %{_libexecdir}/systemd/system-sleep/
+%{_libexecdir}/systemd/system-sleep/storage-fixup
+%{_sbindir}/storage-fixup
+%{_mandir}/man8/storage-fixup.8*
%changelog
++
