- adapterized, fixed %banner usage

Changed files:
    anyterm.spec -> 1.2

diff --git a/anyterm.spec b/anyterm.spec
index 050d946eb188229e7ec8d48928111a6a5d64749d..f95469b83aa667aac8889609c894b53d7b596772 100644 (file)
--- a/anyterm.spec
+++ b/anyterm.spec
@@ -9,18 +9,19 @@ License:      GPL
 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.
@@ -33,7 +34,7 @@ An apache module plus scripts to make a terminal within a web browser.
 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 ..
@@ -48,7 +49,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/httpd.conf,%{_pkglibdir},%
 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
@@ -60,11 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %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