X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_mono.spec;h=b9cd5a78474b34c2c3efe9eab6580a9589f590f8;hb=6e021d5c31b0e6e7230eb4cfd73dc13d53c73410;hp=8f243fcedcc8643c0882f69e33a98f416c836ead;hpb=3c9805506294728512f864ad1af3a5f85958081f;p=packages%2Fapache-mod_mono.git

diff --git a/apache-mod_mono.spec b/apache-mod_mono.spec
index 8f243fc..b9cd5a7 100644
--- a/apache-mod_mono.spec
+++ b/apache-mod_mono.spec
@@ -1,55 +1,51 @@
-#
 # TODO:
-# - figure out how to kill mod-mono-server.exe process
-#   when apache is restarted
-#
-%define		_name		mod_mono
+# - figure out how to kill mod-mono-server.exe process when apache is restarted
+%define		mod_name	mod_mono
 %define 	apxs		/usr/sbin/apxs
 Summary:	Mono module for Apache 2
-Summary(pl):	Modu³ Mono dla serwera Apache 2
-Name:		apache-%{_name}
-Version:	1.0.9
+Summary(pl.UTF-8):	Moduł Mono dla serwera Apache 2
+Name:		apache-%{mod_name}
+Version:	1.2.4
 Release:	1
 Epoch:		1
 License:	Apache
 Group:		Networking/Daemons
-Source0:	http://www.go-mono.com/sources/%{_name}/%{_name}-%{version}.tar.gz
-# Source0-md5:	945bfa14f96ef9c308ea71cb3414e34b
+#Source0Download: http://go-mono.com/sources-stable/
+Source0:	http://www.go-mono.com/sources/mod_mono/%{mod_name}-%{version}.tar.bz2
+# Source0-md5:	17b5278a22b3502d3b9499943cf02273
 Patch0:		%{name}-apu-config.patch
-Patch1:		%{name}-apr_fixes.patch
 URL:		http://www.mono-project.com/
-BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	%{apxs}
+BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	mono-csharp >= 1.0
-Requires:	xsp
-Requires:	apache >= 2.0.52-2
+BuildRequires:	pkgconfig
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	mono-csharp >= 1.0
+Requires:	xsp
 Obsoletes:	mod_mono
-ExcludeArch:	alpha
+ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_httpdir	/home/services/httpd
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define     _sysconfdir /etc/httpd
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This is an experimental module that allows you to run ASP.NET pages on
 Unix with Apache and Mono.
 
-%description -l pl
-Ten eksperymentalny modu³ umo¿liwia uruchamianie stron ASP.NET na
+%description -l pl.UTF-8
+Ten eksperymentalny moduł umożliwia uruchamianie stron ASP.NET na
 Uniksie z serwerem Apache i Mono.
 
 %prep
-%setup -q -n %{_name}-%{version}
+%setup -q -n %{mod_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
-rm -rf $RPM_BUILD_ROOT
 # Build Apache Module
 %{__libtoolize}
 %{__aclocal}
@@ -69,11 +65,11 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd.conf,%{_pkglibdir},%{_mandir}/man8}
 
-install src/.libs/%{_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{_name}.so
-install man/%{_name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install src/.libs/%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install man/%{mod_name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_%{_name}.conf <<EOF
-LoadModule mono_module modules/%{_name}.so
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf <<EOF
+LoadModule mono_module modules/%{mod_name}.so
 MonoApplications "/asp_net:%{_httpdir}/asp_net"
 Alias /asp_net "%{_httpdir}/asp_net"
 <Location /asp_net>
@@ -86,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*
 %doc ChangeLog INSTALL NEWS README
-%attr(755,root,root) %{_pkglibdir}/%{_name}.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %{_mandir}/man8/*