rpms/hddtemp/devel hddtemp-db.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hddtemp.spec, 1.18, 1.19 sources, 1.8, 1.9
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Dec 31 10:29:15 UTC 2006
- Previous message (by thread): rpms/hddtemp/FC-6 hddtemp-db.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hddtemp.spec, 1.18, 1.19 sources, 1.8, 1.9
- Next message (by thread): rpms/erlang/devel erlang.spec,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv387/devel
Modified Files:
.cvsignore hddtemp.spec sources
Added Files:
hddtemp-db.patch
Log Message:
* Sun Dec 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.10.beta15
- Apply patches from Debian containing bunch of hddtemp.db updates and
guess mode improvements for drives not in the database.
hddtemp-db.patch:
--- NEW FILE hddtemp-db.patch ---
diff -u -r1.11 hddtemp.db
--- hddtemp.db 3 May 2006 18:07:11 -0000 1.11
+++ hddtemp.db 31 Dec 2006 09:54:36 -0000
@@ -79,6 +79,8 @@
"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)"
"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT"
+"FUJITSU MHV2100BH" 194 C "FUJITSU MHV2100BH"
+"FUJITSU MHV2060AH" 194 C "FUJITSU MHV2060AH"
"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH"
"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH"
@@ -112,6 +114,7 @@
"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA"
"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB"
+"HDS722516VLSA80" 194 C "Hitachi Deskstar 7K250 160GB, 7200RPM, 8MB, SATA"
"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA"
@@ -190,8 +193,9 @@
"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family"
"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM"
+"Maxtor 6V(25|30)0F0" 194 C "Maxtor DiamondMax 10 SATA II 16MB 7200RPM"
"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9"
-"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
+"Maxtor 7[LV](25|30)0[RSF]0" 194 C "Maxtor MaxLineIII 250/300GB"
"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM"
"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8"
@@ -214,7 +218,9 @@
# somenone reported a problem with the SP8004H which reports a temperature
# 10°C below the ambient temperature
"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series"
+"SAMSUNG HD160JJ" 194 C "Samsung SpinPoint P series (7200RPM, 8MB cache)"
"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)"
+"SAMSUNG HD300LJ" 194 C "Samsung SpinPoint T series"
"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch"
"SAMSUNG SW0434A" 0 C "Samsung SW0434A"
"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie"
@@ -261,6 +267,7 @@
"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb"
"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB"
"ST340016A" 194 C "Seagate ST340016A"
+"ST3400633(A|AS)" 194 C "Seagate Barracuda 7200.9 400 GB"
"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)"
"ST340823A" 194 C "Seagate U Series 5 40823"
"ST340824A" 194 C "Seagate Barracuda III"
@@ -285,17 +292,25 @@
"ST3120026A" 194 C "Seagate Barracuda V ST3120026A"
"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A"
"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
+"ST316081[12](A|AS)" 194 C "Seagate Barracuda 7200.9 160GB"
"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)"
"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200[68]20(A|AS)" 194 C "Seagate Barracuda 7200.10 200GB"
"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
-"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb"
+"ST3200826A" 194 C "Seagate Barracuda 7200.8 200GB"
"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB"
+"ST3250624AS" 194 C "Seagate Barracuda 7200.9 250GB SATA"
+"ST3250624NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB"
-"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB"
"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
+"ST3300[68]20(A|AS)" 194 C "Seagate Barracuda 7200.10 300GB"
"ST3300831A" 194 C "Seagate 300GB ST3300831A"
+"ST3320[68]20(A|AS)" 194 C "Seagate Barracuda 7200.10 320GB"
+"ST3400[68]20(A|AS)" 194 C "Seagate Barracuda 7200.10 400GB"
"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB"
-"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB"
+"ST3500[68]30(A|AS)" 194 C "Seagate Barracuda 7200.10 500GB"
+"ST3750[68]40(A|AS)" 194 C "Seagate Barracuda 7200.10 750GB"
+"ST380[28]110(A|AS)" 194 C "Seagate Barracuda 7200.9 80 GB"
"ST910021A" 194 C "Seagate Momentus 7200.1 100GB"
"ST9100823A" 194 C "Seagate Momentus 5400.2 100GB"
"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB"
@@ -306,6 +321,7 @@
"ST960822A" 194 C "Seagate Momentus 5400.2 60GB"
"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA"
"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB"
+"ST98823AS" 194 C "Seagate Momentus 5400.2 80GB SATA"
########################################
@@ -313,6 +329,7 @@
########################################
"MK4313MAT" 220 C "Toshiba MK4313MAT"
"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX"
+"TOSHIBA MK1032GSX" 194 C "Toshiba MK1032GSX"
"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP"
"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS"
"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS"
@@ -333,6 +350,7 @@
"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX"
"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS"
"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX"
+"TOSHIBA MK8032GSX" 194 C "Toshiba MK8032GSX"
"MK4025GAS" 194 C "Toshiba MK4025GAS"
@@ -353,7 +371,7 @@
"WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB"
"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB"
"WDC WD400BB-00CAA0" 0 C "Western Digital 400BB-00CAA0"
-"WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-00[DJ][KH]A0" 194 C "Western Digital Caviar WD400BB"
"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0"
#"WDC WD400BB-00GFA0" 0 C ""
"WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB"
@@ -372,7 +390,7 @@
"WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0"
"WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0"
"WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor"
-"WDC WD740GD-([05]0FL[AC]0|75FLA1)" 194 C "Western Digital SATA Raptor 74GB 8MB"
+"WDC WD740GD-([05]0FL[AC][01]|75FLA1)" 194 C "Western Digital SATA Raptor 74GB 8MB"
"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1"
"WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go"
"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0"
@@ -384,29 +402,35 @@
"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB"
"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB"
"WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB"
-"WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800JD-(00|55|75)(HK|JR|JN)[AC]0" 194 C "Western Digital SATA 80GB, 8MB Cache"
"WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
"WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0"
"WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB"
+"WDC WD1200JB-00(EV|FU|GV|RE)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB"
"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB"
-"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD"
+"WDC WD1200JD-00(GBB|HBC|FYB)0" 194 C "Western Digital WD1200JD"
"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB"
"WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
+"WDC WD1500ADFD-00NLR0" 194 C "Western Digital SATA Raptor 150GB 16MB"
"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB"
"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB"
"WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB"
"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB"
"WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB"
+"WDC WD2000JD-00FYB0" 194 C "Western Digital WD2000JD"
"WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB"
"WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB"
-"WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
+"WDC WD2500JD-(00G|32H|75H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
"WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0"
"WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB"
"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1"
"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB"
+"WDC WD2500KS-00MJB0" 194 C "Western Digital Caviar SE16 250GB 16MB"
+"WDC WD2500YD-01NVB1" 194 C "Western Digital Caviar RE 250GB 16MB"
"WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB"
"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB"
+"WDC WD3200KS-00PFB0" 194 C "Western Digital Caviar 320GB 16MB"
+"WDC WD3200SD-01KNB0" 194 C "Western Digital Caviar RE 320GB SATA 8MB"
"WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB"
"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 3 May 2006 18:07:11 -0000 1.7
+++ .cvsignore 31 Dec 2006 10:28:45 -0000 1.8
@@ -1 +1,2 @@
hddtemp-0.3-beta15.tar.bz2
+hddtemp_0.3-beta15-33.diff.gz
Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hddtemp.spec 29 Aug 2006 21:17:43 -0000 1.18
+++ hddtemp.spec 31 Dec 2006 10:28:45 -0000 1.19
@@ -2,7 +2,7 @@
Name: hddtemp
Version: 0.3
-Release: 0.9.%{beta}%{?dist}
+Release: 0.10.%{beta}%{?dist}
Summary: Hard disk temperature tool
Group: Applications/System
@@ -14,9 +14,10 @@
Source3: %{name}.sysconfig
Source4: %{name}.pam
Source5: %{name}.consoleapp
+Patch0: %{name}-db.patch
+Patch1: http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-33.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{__perl}
BuildRequires: gettext
Requires: /sbin/chkconfig
Requires: %{_bindir}/consolehelper
@@ -28,13 +29,16 @@
%prep
%setup -q -n %{name}-%{version}-%{beta}
-cp -p %{SOURCE2} ./hddtemp.init
-%{__perl} -pi -e \
- 's|__ETCDIR__|%{_sysconfdir}|g ;
- s|__SBINDIR__|%{_sbindir}|g ;
- s|__INITDIR__|%{_initrddir}|g ;
- s|__LOCKDIR__|%{_localstatedir}/lock|g' \
- hddtemp.init
+cp -p %{SOURCE1} ./hddtemp.db
+%patch0 -p0
+%patch1 -p1
+sed -i -e s/Celius/Celsius/g src/hddtemp.c po/*.po*
+sed -i -e 's|/etc/hddtemp.db|/usr/share/misc/hddtemp.db|' doc/hddtemp.8
+sed -e 's|__ETCDIR__|%{_sysconfdir}|g' \
+ -e 's|__SBINDIR__|%{_sbindir}|g' \
+ -e 's|__INITDIR__|%{_initrddir}|g' \
+ -e 's|__LOCKDIR__|%{_localstatedir}/lock|g' \
+ %{SOURCE2} > hddtemp.init
chmod -x contribs/analyze/*
rm COPYING ; cp -p GPL-2 COPYING
@@ -47,27 +51,27 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db
+install -Dpm 644 hddtemp.db $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db
install -Dpm 755 hddtemp.init $RPM_BUILD_ROOT%{_initrddir}/hddtemp
install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/hddtemp
install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp
install -Dpm 644 %{SOURCE5} \
- $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp
+ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp
%find_lang %{name}
%post
/sbin/chkconfig --add hddtemp
-if [ $1 -gt 1 ]; then
- %{_initrddir}/hddtemp try-restart >/dev/null || :
+if [ $1 -gt 1 ] ; then
+ %{_initrddir}/hddtemp try-restart >/dev/null || :
fi
%preun
-if [ $1 -eq 0 ]; then
- %{_initrddir}/hddtemp stop >/dev/null 2>&1 || :
- /sbin/chkconfig --del hddtemp
+if [ $1 -eq 0 ] ; then
+ %{_initrddir}/hddtemp stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del hddtemp
fi
@@ -89,6 +93,10 @@
%changelog
+* Sun Dec 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.10.beta15
+- Apply patches from Debian containing bunch of hddtemp.db updates and
+ guess mode improvements for drives not in the database.
+
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.9.beta15
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 3 May 2006 18:07:11 -0000 1.8
+++ sources 31 Dec 2006 10:28:45 -0000 1.9
@@ -1 +1,2 @@
8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2
+ca2f01fd533ec8130d96b46d244f1204 hddtemp_0.3-beta15-33.diff.gz
- Previous message (by thread): rpms/hddtemp/FC-6 hddtemp-db.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hddtemp.spec, 1.18, 1.19 sources, 1.8, 1.9
- Next message (by thread): rpms/erlang/devel erlang.spec,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list