From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Mon, 5 Sep 2005 07:21:16 +0000 (+0000)
Subject: - updated to 0.5.4
X-Git-Tag: auto/ac/abook-0_5_4-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fac%2Fabook-0_5_4-1;p=packages%2Fabook.git

- updated to 0.5.4
- -etc_dir.patch replaced with -home_etc.patch

Changed files:
    abook-etc_dir.patch -> 1.2
    abook-home_etc.patch -> 1.2
    abook.spec -> 1.38
---

diff --git a/abook-etc_dir.patch b/abook-etc_dir.patch
deleted file mode 100644
index 5c1e8ba..0000000
--- a/abook-etc_dir.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nru abook-0.4.17/abook.c abook-0.4.17.new/abook.c
---- abook-0.4.17/abook.c	Tue Apr  2 20:45:47 2002
-+++ abook-0.4.17.new/abook.c	Sat Mar 22 14:14:51 2003
-@@ -63,7 +63,13 @@
- 	/*if( options_get_int("datafile", "autosave") )*/
- 
- 	if( load_database(datafile) == 2 ) {
--		char *tmp = strconcat(getenv("HOME"),
-+		char *etc_dir = getenv("ETC_DIR");
-+		char *tmp;
-+    
-+		if (etc_dir)
-+			tmp = strconcat(etc_dir, "/" ETC_DIR_DATAFILE, NULL);
-+		else
-+			tmp = strconcat(getenv("HOME"),
- 				"/" DATAFILE, NULL);
- 
- 		if( safe_strcmp(tmp, datafile) ) {
-@@ -119,17 +125,22 @@
- set_filenames()
- {
- 	struct stat s;
-+	char *etc_dir = getenv("ETC_DIR");
-+	if (etc_dir) {
-+		if (!datafile)
-+			datafile = strconcat(etc_dir, "/" ETC_DIR_DATAFILE, NULL);
-+		rcfile = strconcat(etc_dir, "/" ETC_DIR_RCFILE, NULL);
-+	} else {
-+		if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
-+			fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
-+			exit(1);
-+		}
- 
--	if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
--		fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
--		exit(1);
--	}
--
--	if (!datafile)
--		datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
--
--	rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
-+		if (!datafile)
-+			datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
- 
-+		rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
-+	}
- 	atexit(free_filenames);
- }
- 
-diff -Nru abook-0.4.17/abook.h abook-0.4.17.new/abook.h
---- abook-0.4.17/abook.h	Sat Sep 29 16:44:10 2001
-+++ abook-0.4.17.new/abook.h	Sat Mar 22 14:08:42 2003
-@@ -24,7 +24,7 @@
- 
- #define DEFAULT_UMASK	066
- #define DATAFILE	".abook.addressbook"
--
-+#define ETC_DIR_DATAFILE "abook.addressbook"
- /*
-  * some "abookwide" useful macros
-  */
-diff -Nru abook-0.4.17/options.h abook-0.4.17.new/options.h
---- abook-0.4.17/options.h	Mon Apr 23 14:58:43 2001
-+++ abook-0.4.17.new/options.h	Sat Mar 22 14:09:11 2003
-@@ -2,6 +2,7 @@
- #define _OPTIONS_H
- 
- #define RCFILE		".abookrc"
-+#define ETC_DIR_RCFILE "abookrc"
- #define SYSWIDE_RCFILE	"/etc/abookrc"
- 
- #include "conff.h"
diff --git a/abook-home_etc.patch b/abook-home_etc.patch
index 52cf2ff..5d46776 100644
--- a/abook-home_etc.patch
+++ b/abook-home_etc.patch
@@ -1,73 +1,44 @@
-diff -Nru abook-0.4.17/abook.c abook-0.4.17.new/abook.c
---- abook-0.4.17/abook.c	Tue Apr  2 20:45:47 2002
-+++ abook-0.4.17.new/abook.c	Sat Mar 22 14:14:51 2003
-@@ -63,7 +63,13 @@
- 	/*if( options_get_int("datafile", "autosave") )*/
+diff -burN abook-0.5.4.orig/abook.c abook-0.5.4/abook.c
+--- abook-0.5.4.orig/abook.c	2005-09-05 09:05:10.903458032 +0200
++++ abook-0.5.4/abook.c	2005-09-05 09:17:13.733571152 +0200
+@@ -70,13 +70,15 @@
+ {
+ 	struct stat s;
+ 	char *dir;
++	char *home;
+ 
+ 	assert(!is_ui_initialized());
+ 
+ 	if(alternative_datafile)
+ 		return;
  
- 	if( load_database(datafile) == 2 ) {
--		char *tmp = strconcat(getenv("HOME"),
-+		char *config_dir = getenv("CONFIG_DIR");
-+		char *tmp;
-+    
-+		if (config_dir)
-+			tmp = strconcat(config_dir, "/" CONFIG_DIR_DATAFILE, NULL);
-+		else
-+			tmp = strconcat(getenv("HOME"),
- 				"/" DATAFILE, NULL);
+-	dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL);
++	home = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
++	dir = strconcat(home, "/" DIR_IN_HOME, NULL);
+ 	assert(dir != NULL);
  
- 		if( safe_strcmp(tmp, datafile) ) {
-@@ -119,17 +125,22 @@
+ 	if(stat(dir, &s) == -1) {
+@@ -207,18 +209,21 @@
  set_filenames()
  {
  	struct stat s;
-+	char *config_dir = getenv("CONFIG_DIR");
-+	if (config_dir) {
-+		if (!datafile)
-+			datafile = strconcat(config_dir, "/" CONFIG_DIR_DATAFILE, NULL);
-+		rcfile = strconcat(config_dir, "/" CONFIG_DIR_RCFILE, NULL);
-+	} else {
-+		if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
-+			fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
-+			exit(1);
-+		}
++	char * home;
  
--	if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
--		fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
--		exit(1);
--	}
--
--	if (!datafile)
--		datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
--
--	rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
-+		if (!datafile)
-+			datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
+ 	if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
+ 		fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
+ 		exit(EXIT_FAILURE);
+ 	}
  
-+		rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
-+	}
- 	atexit(free_filenames);
- }
- 
-diff -Nru abook-0.4.17/abook.h abook-0.4.17.new/abook.h
---- abook-0.4.17/abook.h	Sat Sep 29 16:44:10 2001
-+++ abook-0.4.17.new/abook.h	Sat Mar 22 14:08:42 2003
-@@ -24,7 +24,7 @@
++	home = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
++
+ 	if(!datafile)
+-		datafile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
++		datafile = strconcat(home, "/" DIR_IN_HOME "/"
+ 				DATAFILE, NULL);
  
- #define DEFAULT_UMASK	066
- #define DATAFILE	".abook.addressbook"
--
-+#define CONFIG_DIR_DATAFILE "abook.addressbook"
- /*
-  * some "abookwide" useful macros
-  */
-diff -Nru abook-0.4.17/options.h abook-0.4.17.new/options.h
---- abook-0.4.17/options.h	Mon Apr 23 14:58:43 2001
-+++ abook-0.4.17.new/options.h	Sat Mar 22 14:09:11 2003
-@@ -2,6 +2,7 @@
- #define _OPTIONS_H
+ 	if(!rcfile)
+-		rcfile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
++		rcfile = strconcat(home, "/" DIR_IN_HOME "/"
+ 				RCFILE, NULL);
  
- #define RCFILE		".abookrc"
-+#define CONFIG_DIR_RCFILE "abookrc"
- #define SYSWIDE_RCFILE	"/etc/abookrc"
- 
- #include "conff.h"
+ 	atexit(free_filenames);
diff --git a/abook.spec b/abook.spec
index ffda688..005df63 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,13 +1,13 @@
 Summary:	Text-based addressbook program for mutt
 Summary(pl):	Tekstowa ksi±¿ka adresowa dla klienta pocztowego mutt
 Name:		abook
-Version:	0.5.3
+Version:	0.5.4
 Release:	1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/abook/%{name}-%{version}.tar.gz
-# Source0-md5:	a0e7c6d473f9363f312c2c01769a5281
-Patch0:		%{name}-etc_dir.patch
+# Source0-md5:	433b2e849fa458895e82260a354dde95
+Patch0:		%{name}-home_etc.patch
 URL:		http://abook.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -25,7 +25,7 @@ do u
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
 %{__autoheader}