Author: glen Date: Wed Dec 26 18:38:13 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 2
---- Files affected:
SPECS:
apache-mod_wsgi.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/apache-mod_wsgi.spec
diff -u SPECS/apache-mod_wsgi.spec:1.2 SPECS/apache-mod_wsgi.spec:1.3
--- SPECS/apache-mod_wsgi.spec:1.2 Sun Dec 9 11:42:24 2007
+++ SPECS/apache-mod_wsgi.spec Wed Dec 26 19:38:08 2007
@@ -5,14 +5,14 @@
Summary(pl.UTF-8): Interfejs WSGI dla serwera WWW Apache
Name: apache-mod_%{mod_name}
Version: 1.0
-Release: 1
+Release: 2
License: Apache Group License
Group: Networking/Daemons
Source0:
http://modwsgi.googlecode.com/files/mod_%{mod_name}-%{version}.tar.gz
# Source0-md5: 44e20174c127a50a75f040f881b0a52c
Source1: %{name}.conf
+Patch0: %{name}-apache-version.patch
URL: http://code.google.com/p/modwsgi/
-BuildRequires: apache >= 2.0.52-7
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.0.52-7
BuildRequires: apr-devel >= 1:1.0.0
@@ -24,8 +24,8 @@
Requires: apr >= 1:1.0.0
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 apacheconfdir %(%{apxs} -q SYSCONFDIR
2>/dev/null)/conf.d
+%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
%description
The mod_wsgi adapter is an Apache module that provides a WSGI
@@ -43,21 +43,23 @@
%prep
%setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
%build
%{__aclocal}
%{__autoconf}
+HTTPD_VERSION=$(rpm -q --qf '%{V}' apache-devel); export HTTPD_VERSION
%configure \
--with-apxs=%{apxs}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/61_mod_wsgi.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/61_mod_wsgi.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,8 +75,8 @@
%files
%defattr(644,root,root,755)
%doc 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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -82,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2007-12-26 18:38:08 glen
+- use conf.d for apache config fragment; rel 2
+
Revision 1.2 2007-12-09 10:42:24 glen
- apache-apxs -> %{apxs} in BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_wsgi.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
