- use conf.d for apache config fragment; rel 2

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

diff --git a/apache-mod_mono.spec b/apache-mod_mono.spec
index b9cd5a78474b34c2c3efe9eab6580a9589f590f8..8235717fa6e06c556ef8844fe4f413ff55f99ee3 100644 (file)
--- a/apache-mod_mono.spec
+++ b/apache-mod_mono.spec
@@ -5,15 +5,14 @@
 Summary:       Mono module for Apache 2
 Summary(pl.UTF-8):     Moduł Mono dla serwera Apache 2
 Name:          apache-%{mod_name}
-Version:       1.2.4
-Release:       1
+Version:       1.2.6
+Release:       2
 Epoch:         1
-License:       Apache
+License:       Apache 2.0
 Group:         Networking/Daemons
 #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
+Source0:       http://go-mono.com/sources/mod_mono/%{mod_name}-%{version}.tar.bz2
+# Source0-md5: 51768697b8c714789fb57eddc551a569
 URL:           http://www.mono-project.com/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.52-2
@@ -30,8 +29,8 @@ ExcludeArch:  i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _httpdir        /home/services/httpd
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                apachelibdir    %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 This is an experimental module that allows you to run ASP.NET pages on
@@ -43,7 +42,6 @@ Uniksie z serwerem Apache i Mono.
 
 %prep
 %setup -q -n %{mod_name}-%{version}
-%patch0 -p1
 
 %build
 # Build Apache Module
@@ -53,22 +51,22 @@ Uniksie z serwerem Apache i Mono.
 %{__automake}
 
 %configure \
+       CFLAGS="%{rpmcflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" \
        --with-apxs=%{apxs} \
        --with-apr-config=%{_bindir}/apr-1-config \
-       --with-apu-config=%{_bindir}/apu-1-config \
-       CFLAGS="%{rpmcflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+       --with-apu-config=%{_bindir}/apu-1-config
 
 %{__make} \
        DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd.conf,%{_pkglibdir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{apacheconfdir},%{apachelibdir},%{_mandir}/man8}
 
-install src/.libs/%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install src/.libs/%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
 install man/%{mod_name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf <<EOF
+cat > $RPM_BUILD_ROOT%{apacheconfdir}/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"
@@ -83,6 +81,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog INSTALL NEWS README
-%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/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/mod_mono.so
+%{_mandir}/man8/mod_mono.8*