From 2cf78d71aedd3d204310009597f9ebbc79dbc789 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 28 Nov 2003 11:49:28 +0000
Subject: [PATCH] - added fhs patch, fixed optflags and paths, new-style bcond

Changed files:
    awznode.spec -> 1.22
---
 awznode.spec | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/awznode.spec b/awznode.spec
index de138a5..08526be 100644
--- a/awznode.spec
+++ b/awznode.spec
@@ -1,20 +1,21 @@
 #
 # Conditional build:
-# _with_non_hams	- allow to connect non hams stations
+%bcond_with	non_hams	# allow to connect non hams stations
 #
 Summary:	Easy configurable node/gateway (AX25)
 Summary(pl):	Prosto konfigurowalny przeka¼nik/brama (AX25)
 Name:		awznode
 %define		_pre	pre2
 Version:	0.4
-Release:	0.%{_pre}%{?_with_non_hams:nonhams}
+Release:	0.%{_pre}%{?with_non_hams:nonhams}
 Epoch:		1
 License:	GPL
 Group:		Applications/Communications
 Source0:	ftp://ftp.funet.fi/pub/ham/unix/Linux/packet/awznode/%{name}-v%{version}-%{_pre}.tar.gz
 # Source0-md5:	02f26da4c4db0260c297e1cac6c9d1f5
 Patch0:		%{name}-configure.patch
-Patch1:		awznode-non_hams.patch
+Patch1:		%{name}-fhs.patch
+Patch2:		%{name}-non_hams.patch
 BuildRequires:	libax25-devel
 BuildRequires:	zlib-devel
 Requires:	ax25-tools >= 0.0.8
@@ -22,6 +23,8 @@ Requires:	libax25 >= 0.0.9
 Requires:	zlib >= 1.1.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_localstatedir	/var/lib
+
 %description
 Easy node/gateway software for AX25 procotole. It's usable tool if you
 want create gateway packetradio <> Internet (both sides).
@@ -33,23 +36,26 @@ budowaniu bramek packetradio <> Internet.
 %prep
 %setup -q -n %{name}-v%{version}-%{_pre}
 %patch0 -p0
-%{?_with_non_hams:%patch1 -p1}
+%patch1 -p1
+%{?with_non_hams:%patch2 -p1}
 
 %build
-%configure
+# not autoconf-generated, it doesn't take any parameters
+./configure
 %{__make} \
-	CC="%{__cc} %{rpmcflags} -Wall"
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/ax25/{node,flex} \
+install -d $RPM_BUILD_ROOT%{_localstatedir}/ax25/{node,flex} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_libdir}/ax25/node/help} \
 	$RPM_BUILD_ROOT%{_mandir}/man{1,5,8} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/ax25
 
-install etc/loggedin   $RPM_BUILD_ROOT/var/ax25/node
-install etc/lastlog    $RPM_BUILD_ROOT/var/ax25/node
-install etc/gateways   $RPM_BUILD_ROOT/var/ax25/flex
+install etc/loggedin   $RPM_BUILD_ROOT%{_localstatedir}/ax25/node
+install etc/lastlog    $RPM_BUILD_ROOT%{_localstatedir}/ax25/node
+install etc/gateways   $RPM_BUILD_ROOT%{_localstatedir}/ax25/flex
 
 install node $RPM_BUILD_ROOT%{_sbindir}
 install nodeusers $RPM_BUILD_ROOT%{_sbindir}
@@ -80,5 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/flexd
 %attr(4775,root,root) %{_sbindir}/node
 %attr(600,root,root) %{_sysconfdir}/ax25/*
+%{_libdir}/ax25
 %{_mandir}/man?/*
-/var/ax25/*
+%{_localstatedir}/ax25/*
-- 
2.44.0