X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dgee.spec;h=cf028716e51aa4f388396d58400b9a9f966465f8;hb=39709ac0dc1dba7365694e5ae1505b655b354d1a;hp=1f17114b407029d60a64c553640c1396686f5f80;hpb=89066afcc7d3f435ac8bf1e0abc9997f4f61bc3a;p=packages%2Fdgee.git

diff --git a/dgee.spec b/dgee.spec
index 1f17114..cf02871 100644
--- a/dgee.spec
+++ b/dgee.spec
@@ -1,19 +1,26 @@
+%bcond_with	apache1
+%define         apxs	/usr/sbin/apxs
 %define		_rel	2
 Summary:	The DotGNU Execution Environment Core
 Name:		dgee
 Version:	0.1.6
-Release:	%{_rel}.0.0.1
+Release:	%{_rel}.0.1.3
 Source0:	http://www.nfluid.com/download/src/%{name}-%{version}-%{_rel}.tgz
 # Source0-md5:	a2573a076832c4c7212479cabda15eff
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-apache.patch
+Patch2:		%{name}-dglib_fix_so.patch
 License:	GPL
 Vendor:		DotGNU
 Group:		Networking/Daemons
+BuildRequires:	apache-devel
 BuildRequires:	expat-devel
 BuildRequires:	goldwater-devel => 0.3.4
 BuildRequires:	phlib-devel => 1.20
 BuildRequires:	pnet-devel => 0.6.0-2
+BuildRequires:	%{apxs}
+Requires:	apache
+Requires(post,preun):	%{apxs}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,34 +31,87 @@ of accepting, validating and satisfying web service requests.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
 	--with-goldwater=%{_prefix} \
-	--with-pnet=%{_prefix}
+	--with-pnet=%{_prefix} \
+	--with-username=http \
+	--with-usergroup=http \
+%if %{with apache1}
+	--with-apache=%{_prefix}
+%else
+	--without-apache \
+	--with-apache2=%{_prefix}
+%endif
 
-%{__make}
+%if %{with apache1}
+%{__make} 
+%else
+%{__make} \
+	APACHE=
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with apache1}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT 
+%else
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	APACHE=
+%endif
+
+%post
+%if %{with apache1}
+if [ -f /etc/httpd/httpd.conf ] && \
+    ! grep -q "^Include.*/mod_dgee.conf" /etc/httpd/httpd.conf; then
+        echo "Include /etc/httpd/mod_dgee.conf" >> /etc/httpd/httpd.conf
+fi
+%endif
+
+%{apxs} -e -a -n dgee %{_pkglibdir}/mod_dgee.so 1>&2
+if [ -f /var/lock/subsys/httpd ]; then
+        /etc/rc.d/init.d/httpd restart 1>&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+%if %{with apache1}
+        umask 027
+        grep -E -v "^Include.*/mod_dgee.conf" /etc/httpd/httpd.conf > \
+                /etc/httpd/httpd.conf.tmp
+        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+%endif
+        %{apxs} -e -A -n dgee %{_pkglibdir}/mod_dgee.so 1>&2
+        if [ -f /var/lock/subsys/httpd ]; then
+                /etc/rc.d/init.d/httpd restart 1>&2
+        fi
+fi
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc BINARYINSTALL INSTALL QUICKSTART README COPYING
 %attr(755,root,root) %{_bindir}/*
 %config %{_sysconfdir}/%{name}*
-%config %{_sysconfdir}/httpd/mod_%{name}.conf
 %{_libdir}/%{name}
 %{_libdir}/libdgee.*
 %{_libdir}/libdgxml.*
+%if %{with apache1}
+%config %{_sysconfdir}/httpd/mod_%{name}.conf
 %{_libdir}/apache/mod_%{name}.so
+%else
+#%config %{_sysconfdir}/httpd/mod_%{name}.conf
+#%{_libdir}/apache/mod_%{name}.so
+%endif
 %{_datadir}/%{name}
 
 # Local variables: