rpms/joe/devel joe-3.5-time.patch,NONE,1.1 joe.spec,1.34,1.35

Wed Feb 7 13:38:30 UTC 2007

Author: varekova

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8709

Modified Files:
	joe.spec 
Added Files:
	joe-3.5-time.patch 
Log Message:
- fix 227487 - joe wakes up spuriously once per ...
  patch by Arjan van de Ven
- spec file cleanup


joe-3.5-time.patch:
 tty.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE joe-3.5-time.patch ---
Index: joe-3.5/tty.c
===================================================================
--- joe-3.5.orig/tty.c
+++ joe-3.5/tty.c
@@ -242,18 +242,19 @@ void ttclose(void)
 }
 
 static int winched = 0;
+int ticked = 0;
 #ifdef SIGWINCH
 /* Window size interrupt handler */
 static RETSIGTYPE winchd(int unused)
 {
 	++winched;
+	ticked = 1;
 	REINSTALL_SIGHANDLER(SIGWINCH, winchd);
 }
 #endif
 
 /* Second ticker */
 
-int ticked = 0;
 static RETSIGTYPE dotick(int unused)
 {
 	ticked = 1;
@@ -277,6 +278,8 @@ void tickon(void)
 {
 #ifdef HAVE_SETITIMER
 	struct itimerval val;
+	struct timeval now;
+	gettimeofday(&now, NULL);
 	val.it_interval.tv_sec = 0;
 	val.it_interval.tv_usec = 0;
 	if (auto_scroll) {
@@ -287,8 +290,8 @@ void tickon(void)
 		val.it_value.tv_sec = 0;
 		val.it_value.tv_usec = tim;
 	} else {
-		val.it_value.tv_sec = 1;
-		val.it_value.tv_usec = 0;
+		val.it_value.tv_sec = 60 - (now.tv_sec % 60);
+		val.it_value.tv_usec = 1000000 - now.tv_usec;
 	}
 	ticked = 0;
 	joe_set_signal(SIGALRM, dotick);


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- joe.spec	23 Oct 2006 10:40:59 -0000	1.34
+++ joe.spec	7 Feb 2007 13:38:28 -0000	1.35
@@ -1,9 +1,9 @@
 %define _sysconfdir /etc
 
-Summary: An easy to use, modeless text editor.
+Summary: An easy to use, modeless text editor
 Name: joe
 Version: 3.5
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -13,6 +13,8 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Patch0: joe-3.5-joerc.patch
 Patch2: joe-3.4-selinux.patch
+Patch3: joe-3.5-time.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -23,10 +25,11 @@
 %setup -q
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
+%patch3 -p1 -b .time
 
 %build
 %configure
-make
+make  %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -42,8 +45,8 @@
 
 %files
 %defattr(-,root,root)
-%doc README TODO HINTS NEWS LIST
-/usr/bin/*
+%doc README TODO HINTS NEWS LIST COPYING
+%{_bindir}/*
 %dir /etc/joe
 %config /etc/joe/*
 %{_mandir}/man1/*
@@ -52,6 +55,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb  7 2007 Ivana Varekova <varekova at redhat.com> 3.5-2
+- fix 227487 - joe wakes up spuriously once per ...
+  patch by Arjan van de Ven
+- spec file cleanup
+
 * Mon Oct 23 2006 Ivana Varekova <varekova at redhat.com> 3.5-1
 - update to 3.5
 
@@ -182,7 +190,7 @@
 - Fixed bugs on ia64 and ppc architectures.
 - Fixed build bugs on ia64.
 
-* Mon Jul 22 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.9.7-7
+* Mon Jul 22 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.9.7-7
 - Make it build again (auto*... sigh. #69409)
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -191,39 +199,39 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.9.7-4
+* Thu Feb 21 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.9.7-4
 - Rebuild
 
-* Mon Feb  4 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.9.7-3
+* Mon Feb  4 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.9.7-3
 - The joe.1 man-page was called <autoconf-arch-string>-joe.1 
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu Nov  8 2001 Trond Eivind Glomsrød <teg at redhat.com> 2.9.7-1
+* Thu Nov  8 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.9.7-1
 - 2.9.7
 
-* Mon Jul 30 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 30 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Patch for wordwrap problem (#50321)
 
-* Mon Jun  4 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jun  4 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - 2.9.6 - someone's developing it again, on sourceforge
 - all patches absorbed or unnecesarry
 - add doc files and URL
 - use %%configure and %%makeinstall
 
-* Wed Feb 28 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Don't try to read .joerc from CWD (#30031)
 - make sure the docs say /etc/joe everywhere
 
-* Fri Nov 17 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Nov 17 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - clean up the patch file from yesterday  
 
-* Thu Nov 16 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Nov 16 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - security fix - don't blindly write to DEADJOE, unlink it
   and create it safely first
 
-* Mon Oct 09 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Oct 09 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - added patch so it will build on Red Hat 6.x (#18639)
 
 * Wed Jul 19 2000 Jakub Jelinek <jakub at redhat.com>
@@ -232,46 +240,46 @@
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Fri Jun 30 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jun 30 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - added new patch for supporting big files (15+ MB). 
 - obsoleted one of our which is contained within the
   above patch
  
-* Tue Jun 27 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jun 27 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - move config files to /etc/joe
 
-* Tue Jun 27 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jun 27 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - added new patch for resizing, by Seth Vidal
 - removed an old patch which did almost the same thing, 
   but not as well
 
-* Tue Jun 20 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jun 20 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - disabled a patch which no longer works
 
-* Mon Jun 19 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jun 19 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - and yet another
 
-* Mon Jun 19 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jun 19 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - once more
 
-* Mon Jun 19 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jun 19 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - rebuild
 
-* Wed Jun 07 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jun 07 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - use symlinked man pages
 - use %%{_mandir}
 
 * Wed May  3 2000 Bill Nottingham <notting at redhat.com>
 - fix for ia64 (sizeof(int) != sizeof(time_t))
 
-* Wed Apr 26 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Apr 26 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - fixed a problem loading .joerc. Thanks to Jeff Peters
   for the patch (#11049)
 
-* Wed Apr 26 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Apr 26 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - patched it to restore the tty after exiting
 
-* Thu Apr 20 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Apr 20 2000 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - gzip man page
 - hardlink the joe man page to jmacs, jpico, jstar, rjoe
 


