- updated to 2.9.2

[packages/apache-mod_apparmor.git] / apache-mod_apparmor.spec

diff --git a/apache-mod_apparmor.spec b/apache-mod_apparmor.spec
index 020b36d55417d92327f31591061aa21bf142c81c..c677186110a7d94b1eed1267d2869e9c302cfdb2 100644 (file)
--- a/apache-mod_apparmor.spec
+++ b/apache-mod_apparmor.spec
@@ -1,50 +1,54 @@
 %define                mod_name        apparmor
 %define        apxs            /usr/sbin/apxs
-%define                _ver 2.0
-%define                _svnrel         64
 Summary:       Apache module: AppArmor
-Summary(pl):   Modu³ Apache'a: AppArmor
+Summary(pl.UTF-8):     Moduł Apache'a: AppArmor
 Name:          apache-mod_%{mod_name}
-Version:       %{_ver}.%{_svnrel}
-Release:       0.9
-License:       GPL
-Group:         Networking/Daemons
-Source0:       http://forgeftp.novell.com/apparmor/Development%20-%20October%20Snapshot/apache2-mod-%{mod_name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5: f01839ada8e1c2ea12d02384b89b15b5
-URL:           http://forge.novell.com/modules/xfmod/project/?apparmor
+Version:       2.9.2
+Release:       1
+Epoch:         1
+License:       LGPL v2.1
+Group:         Networking/Daemons/HTTP
+Source0:       http://launchpad.net/apparmor/2.9/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: 3af6ef84881016bf8d9100f3f8ab036b
+Patch0:                apparmor-build.patch
+URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.52-2
-BuildRequires: libapparmor-devel
+BuildRequires: libapparmor-devel >= 1:%{version}
 Requires:      apache(modules-api) = %apache_modules_api
+Requires:      libapparmor >= 1:%{version}
 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
-%{name} adds support to Apache 2 to provide AppArmor confinement to
-individual CGI scripts handled by Apache modules like mod_php and
+mod_apparmor adds support to Apache 2 to provide AppArmor confinement
+to individual CGI scripts handled by Apache modules like mod_php and
 mod_perl. This package is part of a suite of tools that used to be
 named SubDomain.
 
-%description -l pl
-mod_apparmor dodaje do Apache'a 2 obs³ugê ograniczeñ AppArmor dla
-poszczególnych skryptów CGI obs³ugiwanych przez modu³y Apache'a takie
-jak mod_php czy mod_perl. Ten pakiet jest czê¶ci± zestawu narzêdzi
+%description -l pl.UTF-8
+mod_apparmor dodaje do Apache'a 2 obsługę ograniczeń AppArmor dla
+poszczególnych skryptów CGI obsługiwanych przez moduły Apache'a takie
+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 apparmor-%{version}
+%patch0 -p1
 
 %build
-%{__make} mod_%{mod_name}.so \
+%{__make} -C changehat/mod_apparmor mod_%{mod_name}.so \
        APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd changehat/mod_apparmor
+
 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
@@ -59,5 +63,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(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/00_mod_apparmor.conf
+%attr(755,root,root) %{_pkglibdir}/mod_apparmor.so