SPECS: apache-mod_epp.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:34:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_epp.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_epp.spec
diff -u SPECS/apache-mod_epp.spec:1.7 SPECS/apache-mod_epp.spec:1.8
--- SPECS/apache-mod_epp.spec:1.7	Tue Nov 22 17:35:10 2005
+++ SPECS/apache-mod_epp.spec	Mon Dec 26 20:34:29 2005
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
 # TODO:
 # - example/minimal configuration file
-#
-%include	/usr/lib/rpm/macros.perl
 %define		mod_name	epp
 %define 	apxs		/usr/sbin/apxs
+%include	/usr/lib/rpm/macros.perl
 Summary:	An EPP (Extensible Provisioning Protocol) implementation for Apache2
 Summary(pl):	Implementacja EPP (Extensible Provisioning Protocol) dla Apache2
 Name:		apache-mod_%{mod_name}
@@ -20,12 +19,11 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.43
 BuildRequires:	rpm-perlprov
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2.0.43
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This Apache 2.0 module implements the EPP over TCP protocol as defined
@@ -52,14 +50,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/httpd/httpd.conf,%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_bindir},%{_sysconfdir}/httpd.conf,%{_examplesdir}/%{name}-%{version}}
 
-libtool --mode=install install -D mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-install -D epptelnet.pl $RPM_BUILD_ROOT%{_bindir}/epptelnet.pl
+libtool --mode=install install mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}
+rm -f $RPM_BUILD_ROOT%{_pkglibdir}/*.{l,}a
 
-cp -r examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install epptelnet.pl $RPM_BUILD_ROOT%{_bindir}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > $RPM_BUILD_ROOT/etc/httpd/httpd.conf/68_mod_%{mod_name}.conf
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/68_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,8 +67,6 @@
 %post
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
-else
-        echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
 fi
 
 %preun
@@ -81,10 +79,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README TODO epp-erd*
-%attr(755,root,root) %{_bindir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
+%attr(755,root,root) %{_bindir}/*
 %{_examplesdir}/%{name}-%{version}
-%config %{_sysconfdir}/httpd.conf/*.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/12/26 19:34:29  glen
+- unified
+
 Revision 1.7  2005/11/22 16:35:10  arekm
 - up to 1.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_epp.spec?r1=1.7&r2=1.8&f=u