X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_apparmor.spec;h=6d837a9e4bb77c86d4a55543cf5eb36d2527b0ed;hb=refs%2Fheads%2Fmaster;hp=49600ded34b3b131d1695400503d49e2eef2e443;hpb=d4c2d6d1ea5bae12790316fbf6d2be70852db3f0;p=packages%2Fapache-mod_apparmor.git

diff --git a/apache-mod_apparmor.spec b/apache-mod_apparmor.spec
index 49600de..7af5bf1 100644
--- a/apache-mod_apparmor.spec
+++ b/apache-mod_apparmor.spec
@@ -1,26 +1,26 @@
 %define		mod_name	apparmor
 %define 	apxs		/usr/sbin/apxs
-%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}
+Version:	3.1.7
 Release:	1
 Epoch:		1
-License:	GPL
+License:	LGPL v2.1
 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-md5:	d4b187c6c72f19a39ae9a4a7f76546f0
-URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
+Source0:	https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	eee581ab969f708f1e4c6f2847c0c7a6
+Patch0:		apparmor-build.patch
+URL:		https://wiki.apparmor.net/
 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
 mod_apparmor adds support to Apache 2 to provide AppArmor confinement
@@ -35,17 +35,20 @@ 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
@@ -60,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