Author: charles Date: Tue Oct 21 00:22:44 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.4 - BR: GeoIP-devel, libtool, rpm-pythonprov - updated %configure & %files
---- Files affected: SPECS: cherokee.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/cherokee.spec diff -u SPECS/cherokee.spec:1.17 SPECS/cherokee.spec:1.18 --- SPECS/cherokee.spec:1.17 Mon May 26 15:48:04 2008 +++ SPECS/cherokee.spec Tue Oct 21 02:22:38 2008 @@ -1,8 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without php # adds PHP support -%bcond_with mono # adds ASPX support +%bcond_without geoip # without GeoIP support %bcond_without gnutls # build with tls=gnutls %bcond_with openssl # build with tls=openssl # @@ -12,12 +11,12 @@ Summary: Fast, Flexible and Lightweight Web server Summary(pl.UTF-8): Cherokee - serwer WWW Name: cherokee -Version: 0.7.0 +Version: 0.9.4 Release: 1 License: GPL v2 Group: Networking/Daemons -Source0: http://www.cherokee-project.com/download/0.7/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 43a904062b9592573f32ee586f04cb21 +Source0: http://www.cherokee-project.com/download/0.9/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 33a43d67baa93029c5fc60ef9f2520bd Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-config.patch @@ -25,8 +24,9 @@ URL: http://www.cherokee-project.com/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: fcgi-devel +BuildRequires: GeoIP-devel %{?with_gnutls:BuildRequires: gnutls-devel >= 0.9.99} +BuildRequires: libtool BuildRequires: mysql-devel BuildRequires: openldap-devel %{?with_openssl:BuildRequires: openssl-devel} @@ -34,6 +34,7 @@ BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: python-docutils +BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: zlib-devel Requires(post,postun): /sbin/ldconfig @@ -44,6 +45,7 @@ Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Suggests: php-fcgi Provides: group(cherokee) Provides: group(http) Provides: user(cherokee) @@ -89,19 +91,18 @@ %patch1 -p1 %build +%{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} %configure \ - --sysconfdir=/etc \ - --enable-os-string="PLD Linux" \ - --with-wwwroot=%{_wwwroot} \ --disable-static \ + --enable-os-string="PLD Linux" \ %{?with_tls:--enable-tls=%{?with_gnutls:gnutls}%{?with_openssl:openssl}} \ - --enable-pthreads \ - %{?with_php:--with-php=%{_prefix}} \ - %{?with_mono:--with-mono=DIR} + --sysconfdir=/etc \ + --with-wwwroot=%{_wwwroot} \ + PHPCGI=%{_bindir}/php.fcgi %{__make} @@ -117,7 +118,6 @@ # users don't need this mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/cherokee-panic -#mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/cherokee_logrotate # modules dlopened by *.so rm -f $RPM_BUILD_ROOT%{_libdir}/cherokee/lib*.la @@ -157,13 +157,9 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog TODO html +%doc AUTHORS ChangeLog TODO html contrib/*to*.py %dir %attr(750,root,root) %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cherokee.conf -%dir %attr(750,root,root) %{_sysconfdir}/mods-available -%dir %attr(750,root,root) %{_sysconfdir}/mods-enabled -%dir %attr(750,root,root) %{_sysconfdir}/sites-available -%dir %attr(750,root,root) %{_sysconfdir}/sites-enabled %dir %attr(750,root,root) %{_sysconfdir}/ssl %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/cherokee @@ -174,9 +170,9 @@ %attr(755,root,root) %{_bindir}/cherokee-tweak %attr(755,root,root) %{_bindir}/spawn-fcgi %attr(755,root,root) %{_sbindir}/cherokee -%attr(755,root,root) %{_sbindir}/cherokee-guardian -%attr(755,root,root) %{_sbindir}/cherokee-panic %attr(755,root,root) %{_sbindir}/cherokee-admin +%attr(755,root,root) %{_sbindir}/cherokee-panic +%attr(755,root,root) %{_sbindir}/cherokee-worker %dir %{_libdir}/cherokee %attr(755,root,root) %{_libdir}/cherokee/libplugin_admin.so @@ -184,13 +180,18 @@ %attr(755,root,root) %{_libdir}/cherokee/libplugin_cgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_combined.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_common.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_custom_error.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_dbslayer.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_deflate.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_directory.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_dirlist.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_error_nn.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_error_redir.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_extensions.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_fastcgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_fcgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_file.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_geoip.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_gzip.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_header.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_htdigest.so @@ -199,12 +200,12 @@ %attr(755,root,root) %{_libdir}/cherokee/libplugin_mirror.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_mysql.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_ncsa.so -%attr(755,root,root) %{_libdir}/cherokee/libplugin_nn.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_not.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_or.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_pam.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_phpcgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_plain.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_proxy.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_redir.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_request.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_round_robin.so @@ -223,8 +224,10 @@ %{_mandir}/man1/cget.1* %{_mandir}/man1/cherokee.1* %{_mandir}/man1/cherokee-admin.1* -%{_mandir}/man1/cherokee_tweak.1* -%{_mandir}/man1/spawn-fcgi.1* +%{_mandir}/man1/cherokee-tweak.1* +%{_mandir}/man1/cherokee-worker.1* +# Conflicts: lighttpd +#%%{_mandir}/man1/spawn-fcgi.1* %dir %{_datadir}/cherokee %dir %{_datadir}/cherokee/admin @@ -241,7 +244,7 @@ %dir %{_wwwroot} %config(missingok) %{_wwwroot}/* -%dir %attr(750,root,logs) /var/log/%{name} +%dir %attr(750,cherokee,logs) /var/log/%{name} %files devel %defattr(644,root,root,755) @@ -267,6 +270,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2008/10/21 00:22:38 charles +- updated to 0.9.4 +- BR: GeoIP-devel, libtool, rpm-pythonprov +- updated %configure & %files + Revision 1.17 2008/05/26 13:48:04 patrys - 0.7.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cherokee.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
