rpms/digitemp/EL-5 digitemp-3.6.0-cflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 digitemp.spec, 1.2, 1.3 sources, 1.2, 1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/digitemp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/EL-5

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:42:19 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/digitemp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- digitemp.spec	28 Aug 2007 18:47:50 -0000	1.2
+++ digitemp.spec	25 Jan 2009 20:16:59 -0000	1.3
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           2%{?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 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %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,12 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
+- Rebuilt against gcc 4.3
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 3.5.0-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:42:19 -0000	1.2
+++ sources	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---