Author: walluck
Date: Mon Feb 5 08:24:23 2007
New Revision: 116178
Modified:
packages/cooker/hddtemp/current/SOURCES/hddtemp.db
packages/cooker/hddtemp/current/SPECS/hddtemp.spec
Log:
add patch for SATA under newer kernels
add patch for WD Caviar RE 160 GB in hddtemp.db
update source URL
add tarball signature
more consistent file list
macros
Modified: packages/cooker/hddtemp/current/SOURCES/hddtemp.db
==============================================================================
--- packages/cooker/hddtemp/current/SOURCES/hddtemp.db (original)
+++ packages/cooker/hddtemp/current/SOURCES/hddtemp.db Mon Feb 5 08:24:23 2007
@@ -118,7 +118,6 @@
"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA"
"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA"
"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB"
-"HDT722516DLAT80" 194 C "Hitachi Deskstar 160GB"
"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)"
"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)"
@@ -195,7 +194,6 @@
"Maxtor 7L300R0" 194 C "Maxtor 7L300R0
MaxLine+III 300GB 7200rpm"
"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine
Plus II 250GB 7200RPM"
"Maxtor 94098U8" 11 C "Maxtor
DiamondMax 40 94098U8"
-"Maxtor 6L160P0" 194 C "Maxtor 160GB"
@@ -214,7 +212,7 @@
############# Samsung drives
########################################
# somenone reported a problem with the SP8004H which reports a temperature
-# 10?C below the ambient temperature
+# 10�C below the ambient temperature
"SAMSUNG HA(200|250)JC" 194 C
"Samsung SpinPoint V120CE series"
"SAMSUNG HD300LD" 194 C "Samsung
SpinPoint M series (7200RPM, 8MB cache)"
"SAMSUNG MP0(302|402|603|804)H" 194 C
"Samsung SpinPoint M40 2.5inch"
Modified: packages/cooker/hddtemp/current/SPECS/hddtemp.spec
==============================================================================
--- packages/cooker/hddtemp/current/SPECS/hddtemp.spec (original)
+++ packages/cooker/hddtemp/current/SPECS/hddtemp.spec Mon Feb 5 08:24:23 2007
@@ -1,23 +1,27 @@
-%define betarel beta15
+%define betarel beta15
-Summary: Hard Drive Temperature Monitoring
-Name: hddtemp
-Version: 0.3
-Release: %mkrel 0.%{betarel}.4
-License: GPL
-Group: Monitoring
-URL: http://www.guzu.net/linux/hddtemp.php
-Source0: http://www.guzu.net/linux/%{name}-%{version}-%{betarel}.tar.bz2
-Source1: http://www.guzu.net/linux/hddtemp.db
-Source2: hddtemp.init
-Source3: hddtemp.sysconfig
-Source4: hddtemp.pam
-Source5: hddtemp.consoleapp
-Requires(post): rpm-helper
-Requires(preun): rpm-helper
-Requires: usermode-consoleonly
-BuildRequires: gettext perl
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary: Hard Drive Temperature Monitoring
+Name: hddtemp
+Version: 0.3
+Release: %mkrel 0.%{betarel}.5
+License: GPL
+Group: Monitoring
+URL: http://www.guzu.net/linux/hddtemp.php
+Source0:
http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-%{version}-%{betarel}.tar.bz2
+Source1:
http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-%{version}-%{betarel}.tar.bz2.sig
+Source2: http://www.guzu.net/linux/hddtemp.db
+Source3: hddtemp.init
+Source4: hddtemp.sysconfig
+Source5: hddtemp.pam
+Source6: hddtemp.consoleapp
+Patch0: hddtemp-0.3-beta15-no-verify-sata-magics.patch
+Patch1: hddtemp-hddtemp-db-wd-re-160.patch
+Requires(post): rpm-helper
+Requires(preun): rpm-helper
+Requires: usermode-consoleonly
+BuildRequires: gettext
+BuildRequires: perl
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
hddtemp is a tool that gives you the temperature of your IDE or SCSI
@@ -25,29 +29,31 @@
information. Only modern hard drives have a temperature sensor.
%prep
-
-%setup -q -n %{name}-%{version}-%{betarel}
+%setup -q -n hddtemp-%{version}-%{betarel}
+%patch0 -p1
+%{__cp} -a %{SOURCE2} hddtemp.db
+%patch1 -p0
%build
-%configure2_5x --with-db-path=%{_sysconfdir}/hddtemp.db
-%make
+%{configure2_5x} --with-db-path=%{_sysconfdir}/hddtemp.db
+%{make}
%install
-rm -rf %{buildroot}
-%makeinstall
+%{__rm} -rf %{buildroot}
+%{makeinstall}
-install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/hddtemp.db
-install -m755 %{SOURCE2} -D %{buildroot}%{_initrddir}/hddtemp
-install -m644 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/sysconfig/hddtemp
-install -d %{buildroot}%{_bindir}
-ln -s consolehelper %{buildroot}%{_bindir}/hddtemp
-install -m644 %{SOURCE4} -D %{buildroot}%{_sysconfdir}/pam.d/hddtemp
-install -m644 %{SOURCE5} -D
%{buildroot}%{_sysconfdir}/security/console.apps/hddtemp
+%{__install} -m 0644 hddtemp.db -D %{buildroot}%{_sysconfdir}/hddtemp.db
+%{__install} -m 0755 %{SOURCE3} -D %{buildroot}%{_initrddir}/hddtemp
+%{__install} -m 0644 %{SOURCE4} -D %{buildroot}%{_sysconfdir}/sysconfig/hddtemp
+%{__mkdir_p} %{buildroot}%{_bindir}
+%{__ln_s} consolehelper %{buildroot}%{_bindir}/hddtemp
+%{__install} -m 0644 %{SOURCE5} -D %{buildroot}%{_sysconfdir}/pam.d/hddtemp
+%{__install} -m 0644 %{SOURCE6} -D
%{buildroot}%{_sysconfdir}/security/console.apps/hddtemp
%find_lang %{name}
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
%post
%_post_service hddtemp
@@ -56,13 +62,13 @@
%_preun_service hddtemp
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
%doc ChangeLog README TODO contribs
-%config(noreplace) %{_sysconfdir}/%{name}.db
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
-%{_initrddir}/%{name}
-%{_bindir}/%{name}
-%{_sbindir}/%{name}
-%{_mandir}/man8/%{name}*
+%attr(0755,root,root) %{_bindir}/hddtemp
+%attr(0755,root,root) %{_initrddir}/hddtemp
+%attr(0755,root,root) %{_sbindir}/hddtemp
+%config(noreplace) %{_sysconfdir}/hddtemp.db
+%config(noreplace) %{_sysconfdir}/sysconfig/hddtemp
+%config(noreplace) %{_sysconfdir}/pam.d/hddtemp
+%config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp
+%{_mandir}/man8/hddtemp.8*
