rpms/boa/devel powered_by_fedora.png, NONE, 1.1 .cvsignore, 1.2, 1.3 boa.spec, 1.3, 1.4 index.html, 1.1, 1.2 sources, 1.2, 1.3 button-freshrpms.png, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Apr 14 18:59:30 UTC 2005
Author: thias
Update of /cvs/extras/rpms/boa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18708
Modified Files:
.cvsignore boa.spec index.html sources
Added Files:
powered_by_fedora.png
Removed Files:
button-freshrpms.png
Log Message:
Update to 0.94.14rc21 with quite a few packaging changes.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Nov 2004 02:43:26 -0000 1.2
+++ .cvsignore 14 Apr 2005 18:59:27 -0000 1.3
@@ -1 +1 @@
-boa-0.94.14rc17.tar.bz2
+boa-0.94.14rc21.tar.gz
Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boa.spec 6 Apr 2005 22:11:13 -0000 1.3
+++ boa.spec 14 Apr 2005 18:59:27 -0000 1.4
@@ -1,24 +1,21 @@
-# $Id$
-
-%define rcver rc17
+%define rcver rc21
%define webroot /var/www/boa
-Summary: The boa web server
+Summary: Single-tasking HTTP server
Name: boa
Version: 0.94.14
-Release: %{?rcver:0.%{rcver}.}3
-
+Release: %{?rcver:0.%{rcver}.}1
Source0: http://www.boa.org/%{name}-%{version}%{?rcver}.tar.bz2
Source1: boa.init
Source2: boa.sysconfig
Source10: index.html
Source11: boa_logo_pasi2.png
-Source12: button-freshrpms.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}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: tetex, texinfo
%{!?_without_gunzip:Requires: gzip}
%{!?_without_gunzip:BuildRequires: gzip}
@@ -40,10 +37,12 @@
--with : debug access poll
--without : gunzip sendfile
+
%prep
%setup -q -n %{name}-%{version}%{?rcver}
%patch -p1 -b .config
+
%build
%configure \
%{!?_with_debug: --disable-debug} \
@@ -51,28 +50,39 @@
%{?_with_poll: --with-poll} \
%{?_without_gunzip: --disable-gunzip} \
%{?_without_sendfile: --disable-sendfile}
-make
-make -C docs boa.html boa.txt
+%{__make}
+%{__make} -C docs boa.html boa.txt
+
%install
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
# Manual install is still mandatory
-install -m 755 -D src/boa %{buildroot}%{_sbindir}/boa
-install -m 755 -D src/boa_indexer %{buildroot}%{_libdir}/boa/boa_indexer
-install -m 644 -D docs/boa.8 %{buildroot}%{_mandir}/man8/boa.8
-install -m 644 -D examples/boa.conf %{buildroot}%{_sysconfdir}/boa/boa.conf
-install -m 644 -D contrib/redhat/boa.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/boa
-install -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/boa
-install -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/boa
+%{__install} -p -m 0755 -D src/boa \
+ %{buildroot}%{_sbindir}/boa
+%{__install} -p -m 0755 -D src/boa_indexer \
+ %{buildroot}%{_libdir}/boa/boa_indexer
+%{__install} -p -m 0644 -D docs/boa.8 \
+ %{buildroot}%{_mandir}/man8/boa.8
+%{__install} -p -m 0644 -D examples/boa.conf \
+ %{buildroot}%{_sysconfdir}/boa/boa.conf
+%{__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
+%{__install} -p -m 0755 -D %{SOURCE2} \
+ %{buildroot}%{_sysconfdir}/sysconfig/boa
-mkdir -p %{buildroot}/%{webroot}/html
-mkdir -p %{buildroot}/%{_localstatedir}/log/boa
+%{__mkdir_p} %{buildroot}/%{webroot}/html
+%{__mkdir_p} %{buildroot}/%{_localstatedir}/log/boa
# Install the default index.html file
-install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{buildroot}%{webroot}/html/
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+ %{buildroot}%{webroot}/html/
+
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
%pre
/usr/sbin/groupadd -r www 2>/dev/null || :
@@ -80,38 +90,49 @@
-d %{webroot} -M -r -g www boa 2>/dev/null || :
%post
-if [ $1 = 1 ]; then
+if [ $1 -eq 1 ]; then
/sbin/chkconfig --add boa
fi
%preun
-if [ $1 = 0 ]; then
- /sbin/service boa stop >/dev/null 2>&1 || :
+if [ $1 -eq 0 ]; then
+ /sbin/service boa stop &>/dev/null || :
/sbin/chkconfig --del boa
fi
%postun
if [ $1 -ge 1 ]; then
- /sbin/service boa condrestart >/dev/null 2>&1 || :
+ /sbin/service boa condrestart &>/dev/null || :
fi
+
%files
%defattr(-, root, root, 0755)
-%doc docs/*.{html,png,txt} COPYING CREDITS README examples/
-%dir %{_sysconfdir}/boa
+%doc COPYING CREDITS README
+%doc docs/*.{html,png,txt} examples/
+%dir %{_sysconfdir}/boa/
%config(noreplace) %{_sysconfdir}/boa/boa.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/boa
%config(noreplace) %{_sysconfdir}/sysconfig/boa
-%{_initrddir}/boa
-%dir %{_libdir}/boa
+/etc/rc.d/init.d/boa
+%dir %{_libdir}/boa/
%{_libdir}/boa/boa_indexer
%{_sbindir}/boa
-%{webroot}
-%dir %{_localstatedir}/log/boa
+%{webroot}/
+%dir %{_localstatedir}/log/boa/
%{_mandir}/man8/*
+
%changelog
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 14 2005 Matthias Saou <http://freshrpms.net/> 0.94.14-0.1.rc21
+- Update to 0.94.14rc21.
+- Change release tag "order" to comply with guidelines (extra info at the end).
+- Change _initrddir (which I still see as plain wrong) to /etc/rc.d/init.d.
+- Replace freshrpms logo with fedora one.
+- Change flashy green from the default index.html to plain white.
+- Minor spec file cosmetic changes.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.94.14-0.rc17.3
- rebuilt
* Mon Feb 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.94.14-0.rc17.2
Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html 9 Nov 2004 02:43:26 -0000 1.1
+++ index.html 14 Apr 2005 18:59:27 -0000 1.2
@@ -7,7 +7,7 @@
<title>Powered by boa</title>
<style type="text/css">
<!--
- body {background: #22ff22; color: #000000}
+ body {background: #ffffff; color: #000000}
img {border: none}
-->
</style>
@@ -17,11 +17,11 @@
<h1>Boa Webserver</h1>
<p>
-<a href="http://www.boa.org/"><img src="boa_logo_pasi2.png" width="96" height="45" alt="powered by boa" /></a>
+<a href="http://www.boa.org/"><img src="boa_logo_pasi2.png" width="96" height="45" alt="Powered by Boa" /></a>
</p>
<p>
-<a href="http://freshrpms.net/"><img src="button-freshrpms.png" width="80" height="26" alt="freshrpms.net" /></a>
+<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a>
</p>
</body>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Nov 2004 02:43:26 -0000 1.2
+++ sources 14 Apr 2005 18:59:27 -0000 1.3
@@ -1 +1 @@
-11e76d89e146d0985df1466919875a3c boa-0.94.14rc17.tar.bz2
+e24b570bd767a124fcfb40a34d148ba9 boa-0.94.14rc21.tar.gz
More information about the fedora-extras-commits
mailing list