rpms/at/FC-6 at-3.1.8-daylight.patch,1.1,1.2 at.spec,1.40,1.41

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/at/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv29777

Modified Files:
	at-3.1.8-daylight.patch at.spec 
Log Message:
Rebuild.


at-3.1.8-daylight.patch:
 at.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

Index: at-3.1.8-daylight.patch
===================================================================
RCS file: /cvs/dist/rpms/at/FC-6/at-3.1.8-daylight.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-3.1.8-daylight.patch	6 Nov 2006 14:02:26 -0000	1.1
+++ at-3.1.8-daylight.patch	11 Dec 2006 14:36:43 -0000	1.2
@@ -1,14 +1,22 @@
---- at-3.1.8/at.c.daylight	2006-11-02 11:09:36.000000000 +0100
-+++ at-3.1.8/at.c	2006-10-30 13:51:35.000000000 +0100
-@@ -775,9 +775,8 @@
+--- at-3.1.8/at.c.daylight	2006-12-11 15:30:29.000000000 +0100
++++ at-3.1.8/at.c	2006-12-11 15:32:32.000000000 +0100
+@@ -775,12 +775,13 @@
      if( tm.tm_mon )
  	tm.tm_mon -= 1;
  
 -    if( tm.tm_mday )
 -    {
 -	tm.tm_isdst = tm_now.tm_isdst;
-+    if( tm.tm_mday ) {
-+//	tm.tm_isdst = tm_now.tm_isdst;
- 	return mktime(&tm);
-     }else
- 	return 0L;
+-	return mktime(&tm);
+-    }else
+-	return 0L;
++	if( tm.tm_mday )                                                                                              
++	{                                                                                                             
++		tm.tm_isdst = -1;                                                                                      
++		t = mktime(&tm);                                                                                       
++		return t;                                                                                              
++	} else                                                                                                        
++		return 0L; 
+ }
+  
+ int


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/FC-6/at.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- at.spec	6 Nov 2006 14:02:26 -0000	1.40
+++ at.spec	11 Dec 2006 14:36:43 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 83%{?dist}
+Release: 84%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -195,6 +195,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Mon Dec 11 2006 Marcela Maslanova <mmaslano at redhat.com> - 3.1.8-84.fc6
+- daylight-saving again, now correct for both time changes
+
 * Tue Oct 31 2006 Marcela Maslanova <mmaslano at redhat.com> - 3.1.8-83.fc6
 - #212506 problem with planning job when using daylight-saving