From 79b4781bc4845a7678fb93195eb246f51b84a74a4d41320b75f86d7d6268cb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 30 Nov 2010 09:41:46 +0000 Subject: [PATCH] fix conflict OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=45 --- _service | 4 ---- _service_error | 2 -- hdparm-9.36.tar.bz2 | 3 +++ hdparm.changes | 11 +++++++++++ hdparm.spec | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 _service delete mode 100644 _service_error create mode 100644 hdparm-9.36.tar.bz2 diff --git a/_service b/_service deleted file mode 100644 index 6672e83..0000000 --- a/_service +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/_service_error b/_service_error deleted file mode 100644 index 5740f60..0000000 --- a/_service_error +++ /dev/null @@ -1,2 +0,0 @@ -service set_version failed: -ERROR: no version is given and can't get detected automatically diff --git a/hdparm-9.36.tar.bz2 b/hdparm-9.36.tar.bz2 new file mode 100644 index 0000000..31e3b3f --- /dev/null +++ b/hdparm-9.36.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1a10926f8bbf000db9f1614484614400b52b4fc1683e1b673805bfd938401ff +size 104981 diff --git a/hdparm.changes b/hdparm.changes index 04e95dc..15cdc52 100644 --- a/hdparm.changes +++ b/hdparm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Nov 29 11:42:35 UTC 2010 - puzel@novell.com + +- update to hdparm-9.36 + - udpated raid1ext4trim.sh script to version 1.4 + - updated wiper.sh to support hfsplus and ntfs filesystem types, + courtesy of Heiko Wegeler + - updated wiper.sh with new flag to enable unattended operation, + and handle SIGPIPE + - updated manpage to indicate max sector range of 65335 for TRIM + ------------------------------------------------------------------- Thu Oct 21 16:13:02 UTC 2010 - mseben@gmail.com diff --git a/hdparm.spec b/hdparm.spec index fc53494..2ba9ebf 100644 --- a/hdparm.spec +++ b/hdparm.spec @@ -24,7 +24,7 @@ Group: Hardware/Other PreReq: %insserv_prereq %fillup_prereq coreutils Provides: base:/sbin/hdparm AutoReqProv: on -Version: VERSION +Version: 9.36 Release: 1 Summary: A Program to get and set hard disk parameters Source: %{name}-%{version}.tar.bz2