rpms/boa/FC-4 boa.spec,1.6,1.7

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/boa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26588/FC-4

Modified Files:
	boa.spec 
Log Message:
Fix for bugzilla #173335 and sync FC-3, FC-4 and devel branches.



Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/FC-4/boa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- boa.spec	16 Apr 2005 15:53:48 -0000	1.6
+++ boa.spec	16 Nov 2005 15:27:20 -0000	1.7
@@ -4,7 +4,10 @@
 Summary: Single-tasking HTTP server
 Name: boa
 Version: 0.94.14
-Release: 0.1%{?rcver:.%{rcver}}
+Release: 0.2%{?rcver:.%{rcver}}%{?dist}
+URL: http://www.boa.org/
+License: GPL
+Group: System Environment/Daemons
 Source0: http://www.boa.org/%{name}-%{version}%{?rcver}.tar.gz
 Source1: boa.init
 Source2: boa.sysconfig
@@ -12,9 +15,6 @@
 Source11: boa_logo_pasi2.png
 Source12: powered_by_fedora.png
 Patch: boa-0.94.14rc17-config.patch
-URL: http://www.boa.org/
-License: GPL
-Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: tetex, texinfo
 %{!?_without_gunzip:Requires: gzip}
@@ -68,7 +68,7 @@
 %{__install} -p -m 0644 -D contrib/rpm/boa.logrotate \
     %{buildroot}%{_sysconfdir}/logrotate.d/boa
 %{__install} -p -m 0755 -D %{SOURCE1} \
-    %{buildroot}/etc/rc.d/init.d/boa
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/boa
 %{__install} -p -m 0755 -D %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/sysconfig/boa
 
@@ -79,6 +79,9 @@
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
     %{buildroot}%{webroot}/html/
 
+# Avoid automatic picking up of perl dependency
+%{__chmod} -x examples/*.{cgi,pl}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -87,7 +90,7 @@
 %pre
 /usr/sbin/groupadd -r www 2>/dev/null || :
 /usr/sbin/useradd -s /bin/false -c "Web server user" \
-        -d %{webroot} -M -r -g www boa 2>/dev/null || :
+    -d %{webroot} -M -r -g www boa 2>/dev/null || :
 
 %post
 if [ $1 -eq 1 ]; then
@@ -114,7 +117,7 @@
 %config(noreplace) %{_sysconfdir}/boa/boa.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/boa
 %config(noreplace) %{_sysconfdir}/sysconfig/boa
-/etc/rc.d/init.d/boa
+%{_sysconfdir}/rc.d/init.d/boa
 %dir %{_libdir}/boa/
 %{_libdir}/boa/boa_indexer
 %{_sbindir}/boa
@@ -124,6 +127,9 @@
 
 
 %changelog
+* Wed Nov 16 2005 Matthias Saou <http://freshrpms.net/> 0.94.14-0.2.rc21
+- Make example cgi scripts -x to avoid perl dependency side-effect (#173335).
+
 * Sat Apr 16 2005 Seth Vidal <skvidal at phy.duke.edu> 0.94.14-0.1.rc21
 - tar.gz not tar.bz2