LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File plan-1.8.7.diff of Package plan (Project home:lnussel:plan)

From 2ffcdc71dadfa3d127b3c70f73b0d9994c2e865c Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.de>
Date: Thu, 6 Mar 2008 12:02:48 +0100
Subject: [PATCH] plan-1.8.7.dif

===================================================================
---
 holiday/holiday_combi  |    2 +-
 holiday/holiday_german |    2 +-
 src/Makefile           |    6 ++++--
 src/config.h           |    6 +++---
 src/daemon.c           |    1 +
 src/g_dbfile.c         |    1 +
 src/main.c             |    1 +
 src/print.c            |    1 +
 src/util.c             |    1 +
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/holiday/holiday_combi b/holiday/holiday_combi
index db9996d..a1d1b4a 100644
--- a/holiday/holiday_combi
+++ b/holiday/holiday_combi
@@ -484,7 +484,7 @@ GBR           "Boxing Day"		rd          on     Dec 26
 AUS_SA  sm    "SA - Proclamation Day"	wk          on     Dec 28
 AUT     sm    "Silvester"		            on     Dec 31
 BEL     sm    "Oudjaar"			            on     Dec 31
-DEU     sm    "Sylvester"		            on     Dec 31
+DEU     sm    "Silvester"		            on     Dec 31
 FRA     cy    "St Sylvestre"		            on     Dec 31
 HUN     sm    "Szilveszter"		            on     Dec 31
 ITA     sm    "S.Silvestro"		            on     Dec 31
diff --git a/holiday/holiday_german b/holiday/holiday_german
index c11324c..3580399 100644
--- a/holiday/holiday_german
+++ b/holiday/holiday_german
@@ -27,4 +27,4 @@ small "3. Advent" on sunday before 24.12. minus 7 days
 small "4. Advent" on sunday before 24.12.
 small "Hl. Abend" on 24.12.
 small "Weihnachten" weekend on 25.12. length 2 days
-small "Sylvester" on 31.12.
+small "Silvester" on 31.12.
diff --git a/src/Makefile b/src/Makefile
index 442e534..baa8dd4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,9 +34,9 @@ LEX=lex
 #				# standard Unix compiler generator
 YACC=yacc
 #				# numerical user ID of <nobody> account
-NOB_UID=60001
+NOB_UID=65534
 #				# default numerical group ID of <nobody>
-NOB_GID=60001
+NOB_GID=65534
 # 				# used by plan to pre-process holiday files,
 #				# plan will check if this file really exists
 CPP_PATH='/lib/cpp -P -I$(HELP)'
@@ -60,6 +60,8 @@ DEBUG=-O2
 DEFTARGET=linux
 #------------------------- end of configuration section ----------------------
 
+-include Make.config
+
 OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
 
 DESTDIR=
diff --git a/src/config.h b/src/config.h
index 28d2bb9..d7c3413 100644
--- a/src/config.h
+++ b/src/config.h
@@ -37,12 +37,12 @@
 #define HOLIDAY_PATH	"~/.holiday"	 /* holiday database */
 #define PLAND_PATH	"~/.pland"	 /* pland database */
 #endif
-#define HOLIDAY_NAME	"holiday"	 /* global holiday dbase (LIB)*/
+#define HOLIDAY_NAME	"holiday/holiday_current"	 /* global holiday dbase (LIB)*/
 #define HELP_FN		"plan.help"	 /* help text file */
 #define DAEMON_FN	"pland"		 /* daemon program */
 #define ALARM_FN	"notifier"	 /* program that shows alarm popup */
-#define PS_SPOOLER	"lp"
-#define DEFAULTPATH	"/usr/local/lib:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd:/usr/bin/X11:/usr/freeware/bin:/usr/freeware/lib:.:../misc"
+#define PS_SPOOLER	"lpr"
+#define DEFAULTPATH	"/usr/lib/plan:/usr/local/lib:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd:/usr/bin/X11:/usr/freeware/bin:/usr/freeware/lib:.:../misc"
 
 
 #if defined(XlibSpecificationRelease) && defined(sgi) || defined(linux)
diff --git a/src/daemon.c b/src/daemon.c
index 5f48d3f..454807d 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -23,6 +23,7 @@ typedef unsigned short	Dimension;
 typedef int		Region;
 typedef void		*XEvent;		/* open Motif */
 typedef int		Boolean;		/* open Motif */
+#undef _GNU_SOURCE
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/g_dbfile.c b/src/g_dbfile.c
index 75d6ebc..798e25b 100644
--- a/src/g_dbfile.c
+++ b/src/g_dbfile.c
@@ -5,6 +5,7 @@
  *	read_dbase(form, path)		read dbase into empty dbase struct
  */
 
+#undef _GNU_SOURCE
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/main.c b/src/main.c
index 12bb060..a7cbc6f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,6 +12,7 @@
  * Author: thomas@bitrot.de (Thomas Driemeyer)
  */
 
+#undef _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/print.c b/src/print.c
index a840966..ad79f6d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -11,6 +11,7 @@
  * More hacking by thomas@bitrot 25.12.98, color
  */
 
+#undef _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
 #include <time.h>
diff --git a/src/util.c b/src/util.c
index 49d01fc..19e07f6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -20,6 +20,7 @@
  *	to_ascii(str, def)		convert octal string to ascii (grok)
  */
  
+#undef _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-- 
1.5.3.4