SPECS: apache-mod_apparmor.spec - no httpd.conf dir provided in th; rel 2

[glen]

Author: glen                         Date: Mon Feb  2 22:49:21 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no httpd.conf dir provided in th; rel 2

---- Files affected:
SPECS:
   apache-mod_apparmor.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_apparmor.spec
diff -u SPECS/apache-mod_apparmor.spec:1.12 SPECS/apache-mod_apparmor.spec:1.13
--- SPECS/apache-mod_apparmor.spec:1.12	Sat Oct 25 17:50:01 2008
+++ SPECS/apache-mod_apparmor.spec	Mon Feb  2 23:49:16 2009
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
 %define		mod_name	apparmor
 %define 	apxs		/usr/sbin/apxs
-%define		_ver 2.3
-%define		_svnrel		907
+%define		ver 	2.3
+%define		svnrel		907
 Summary:	Apache module: AppArmor
 Summary(pl.UTF-8):	Moduł Apache'a: AppArmor
 Name:		apache-mod_%{mod_name}
-Version:	%{_ver}.%{_svnrel}
-Release:	1
+Version:	%{ver}.%{svnrel}
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Networking/Daemons/HTTP
-Source0:	http://forge.novell.com/modules/xfcontent/private.php/apparmor/AppArmor%202.3-Beta1/apache2-mod_%{mod_name}-%{_ver}-%{_svnrel}.tar.gz
+Source0:	http://forge.novell.com/modules/xfcontent/private.php/apparmor/AppArmor%202.3-Beta1/apache2-mod_%{mod_name}-%{ver}-%{svnrel}.tar.gz
 # Source0-md5:	d4b187c6c72f19a39ae9a4a7f76546f0
 URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
 BuildRequires:	%{apxs}
@@ -21,7 +21,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 mod_apparmor adds support to Apache 2 to provide AppArmor confinement
@@ -36,7 +36,7 @@
 zwanych SubDomain.
 
 %prep
-%setup -q -n apache2-mod_%{mod_name}-%{_ver}
+%setup -q -n apache2-mod_%{mod_name}-%{ver}
 
 %build
 %{__make} mod_%{mod_name}.so \
@@ -46,7 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -D mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-install -D mod_%{mod_name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/00_mod_%{mod_name}.conf
+install -D mod_%{mod_name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/00_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,7 +61,7 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -70,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/02/02 22:49:16  glen
+- no httpd.conf dir provided in th; rel 2
+
 Revision 1.12  2008/10/25 15:50:01  blues
 - HTTP group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_apparmor.spec?r1=1.12&r2=1.13&f=u