- no httpd.conf dir provided in th; rel 2

Changed files:
    apache-mod_apparmor.spec -> 1.13

diff --git a/apache-mod_apparmor.spec b/apache-mod_apparmor.spec
index 49600ded34b3b131d1695400503d49e2eef2e443..32930d214e79d70b0eb263a07981d95d55c86dfe 100644 (file)
--- a/apache-mod_apparmor.spec
+++ b/apache-mod_apparmor.spec
@@ -1,16 +1,16 @@
 %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}
@@ -20,7 +20,7 @@ Requires:     apache(modules-api) = %apache_modules_api
 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
@@ -35,7 +35,7 @@ jak mod_php czy mod_perl. Ten pakiet jest częścią zestawu narzędzi
 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 \
@@ -45,7 +45,7 @@ zwanych SubDomain.
 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
@@ -60,5 +60,5 @@ fi
 
 %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