From bc738ff49bad485c6cf0d3918e426dfc63ef8d8c Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jan 25 2009 20:17:00 +0000
Subject: Upgrade to 3.6.0


---

diff --git a/.cvsignore b/.cvsignore
index 3744196..67d74bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz
diff --git a/digitemp-3.5.0-cflags.patch b/digitemp-3.5.0-cflags.patch
deleted file mode 100644
index 924fb27..0000000
--- a/digitemp-3.5.0-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for digitemp >= 3.5.0,
-which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.
-
---- digitemp-3.5.0/Makefile		2007-01-01 19:47:02.000000000 +0100
-+++ digitemp-3.5.0/Makefile.cflags	2007-01-07 03:43:45.000000000 +0100
-@@ -13,7 +13,7 @@
- 
- 
- CC	= gcc
--CFLAGS	= -I./src -I./userial -O2 # -g -Wall
-+CFLAGS	= -I./src -I./userial $(RPM_OPT_FLAGS)
- LIBS	= -lm
- 
- OBJS		=	src/digitemp.o src/device_name.o
diff --git a/digitemp-3.6.0-cflags.patch b/digitemp-3.6.0-cflags.patch
new file mode 100644
index 0000000..a4aa163
--- /dev/null
+++ b/digitemp-3.6.0-cflags.patch
@@ -0,0 +1,14 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for digitemp >= 3.6.0,
+which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.
+
+--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
++++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
+@@ -12,7 +12,7 @@
+ VERSION = 3.6.0
+ 
+ CC	= gcc
+-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
++CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
+ 
+ OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
+ HDRS		= 	src/digitemp.h src/device_name.h
diff --git a/digitemp.spec b/digitemp.spec
index 7a1eb5e..a343155 100644
--- a/digitemp.spec
+++ b/digitemp.spec
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           3%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@ MicroLAN Coupler (used in 1-wire hubs) and the AAG TAI-8540 humidity sensor.
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@ install -m 755 digitemp_DS9097 digitemp_DS9097U $RPM_BUILD_ROOT%{_bindir}
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert@fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
 * Sun Feb 10 2008 Robert Scheck <robert@fedoraproject.org> 3.5.0-3
 - Rebuilt against gcc 4.3
 
diff --git a/sources b/sources
index 6ac32b9..f2abe50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz