From 27e1dfc7fe186ed1c837112e3f08c0a16a2bf4ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pawe=C5=82=20Go=C5=82aszewski?= <blues@pld-linux.org>
Date: Thu, 14 Mar 2013 10:49:30 +0100
Subject: [PATCH] - rel.2

home_etc support dropped, no ac/am regeneration
---
 abook-home_etc.patch | 44 --------------------------------------------
 abook.spec           | 19 ++++++-------------
 2 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 abook-home_etc.patch

diff --git a/abook-home_etc.patch b/abook-home_etc.patch
deleted file mode 100644
index 82ddadb..0000000
--- a/abook-home_etc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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;
- 
--	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(stat(dir, &s) == -1) {
-@@ -207,18 +209,21 @@
- set_filenames()
- {
- 	struct stat s;
-+	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(EXIT_FAILURE);
- 	}
- 
-+	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);
- 
- 	if(!rcfile)
--		rcfile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
-+		rcfile = strconcat(home, "/" DIR_IN_HOME "/"
- 				RCFILE, NULL);
- 
- 	atexit(free_filenames);
diff --git a/abook.spec b/abook.spec
index 230a0aa..b7e4fc7 100644
--- a/abook.spec
+++ b/abook.spec
@@ -4,15 +4,14 @@ Summary:	Text-based addressbook program for mutt
 Summary(pl.UTF-8):	Tekstowa książka adresowa dla klienta pocztowego mutt
 Name:		abook
 Version:	0.6.0
-Release:	0.%{subver}.1
+Release:	0.%{subver}.2
 License:	GPL v2+
 Group:		Applications/Mail
 Source0:	http://abook.sourceforge.net/devel/%{name}-%{version}%{subver}.tar.gz
 # Source0-md5:	1e4a7210b3507db7b3d47ee7a2457934
-#Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-tinfo_link.patch
-Patch2:		%{name}-vcard_import.patch
-Patch3:		%{name}-ea5caf0.patch
+Patch0:		%{name}-tinfo_link.patch
+Patch1:		%{name}-vcard_import.patch
+Patch2:		%{name}-ea5caf0.patch
 URL:		http://abook.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -31,17 +30,11 @@ do użycia z programem pocztowym mutt.
 
 %prep
 %setup -q -n %{name}-%{version}%{subver}
-#%patch0 -p1
-%patch1
+%patch0
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
-#%{__gettextize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
 %configure
 %{__make}
 
-- 
2.44.0