SPECS: anyterm.spec - adapterized, fixed %banner usage

[glen]

Author: glen                         Date: Sat Jul 16 10:52:59 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized, fixed %banner usage

---- Files affected:
SPECS:
   anyterm.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/anyterm.spec
diff -u SPECS/anyterm.spec:1.1 SPECS/anyterm.spec:1.2
--- SPECS/anyterm.spec:1.1	Sat Jul 16 07:36:31 2005
+++ SPECS/anyterm.spec	Sat Jul 16 12:52:54 2005
@@ -10,18 +10,19 @@
 Group:		Networking/Daemons
 Source0:	http://anyterm.org/download/%{name}-%{version}.tbz2
 # Source0-md5:	cf841703b7438866e573f5a33137ff6f
-Patch0:	%{name}-makefile.patch
+Patch0:		%{name}-makefile.patch
 URL:		http://anyterm.org/
 BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	apr-devel
 BuildRequires:	rote-devel >= 0.2.8
+BuildRequires:	rpmbuild(macros) >= 1.194
 BuildRequires:	%{apxs}
 Requires:	apache >= 2.0.52-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_httpdir	/home/services/httpd
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define   _sysconfdir /etc/httpd
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir /etc/httpd
 
 %description
 An apache module plus scripts to make a terminal within a web browser.
@@ -34,7 +35,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd apachemod
 %{__make} \
-	INCLUDES='-I/usr/include/apr-util' \
+	INCLUDES='-I%{_includedir}/apr-util' \
 	APXS2=apxs \
 	APR_CONFIG=apr-1-config
 cd ..
@@ -49,7 +50,7 @@
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_anyterm.conf <<END
 LoadModule anyterm modules/%{name}.so
 Alias /%{name} "%{_httpdir}/%{name}"
-anyterm_command '/usr/sbin/anygetty --remotehost "Anyterm: %h"'
+anyterm_command '%{_sbindir}/anygetty --remotehost "Anyterm: %h"'
 END
 
 install apachemod/.libs/%{name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{name}.so
@@ -61,14 +62,16 @@
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*
 %doc README
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
 %attr(755,root,root) %{_pkglibdir}/%{name}.so
 %attr(755,root,root) %{_sbindir}/anygetty
 %{_httpdir}/%{name}
 
 %post
-%banner "for full function, setuid %{_sbindir}/anygetty"
+%banner %{name} <<EOF
+For full function, setuid %{_sbindir}/anygetty.
+EOF
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,7 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/07/16 10:52:54  glen
+- adapterized, fixed %banner usage
+
 Revision 1.1  2005/07/16 05:36:31  aredridel
 - added
 - NFY: login hangs from anygetty
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/anyterm.spec?r1=1.1&r2=1.2&f=u