cherokee: use external pcre, use tmpfiles.d(5), move cherokee-config to -devel.

This commit is contained in:
Juan RP 2012-01-28 17:23:07 +01:00
parent 2c06ac51b7
commit 83cf169af6
5 changed files with 22 additions and 22 deletions

View file

@ -5,11 +5,13 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run libcherokee Add_dependency run libcherokee
do_install() do_install() {
{ vmove usr/bin/cherokee-config usr/bin
vmove usr/include usr vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib vmove usr/lib/pkgconfig usr/lib
vmove usr/share/aclocal usr/share vmove usr/share/aclocal usr/share
} }

View file

@ -0,0 +1,3 @@
d /etc/cherokee/ssl 0755 httpd httpd -
d /var/log/cherokee 0755 httpd httpd -
d /var/lib/cherokee/graphs/images 0755 httpd httpd -

View file

@ -15,3 +15,4 @@ libnsl.so.1
libssl.so.1 libssl.so.1
libpam.so.0 libpam.so.0
libldap-2.4.so.2 libldap-2.4.so.2
libpcre.so.0

View file

@ -1,5 +1,6 @@
# Template file for 'libcherokee'. # Template file for 'libcherokee'.
# #
revision=1
short_desc="${short_desc} (Runtime library)" short_desc="${short_desc} (Runtime library)"
long_desc="${long_desc} long_desc="${long_desc}

View file

@ -1,13 +1,13 @@
# Template file for 'cherokee' # Template file for 'cherokee'
pkgname=cherokee pkgname=cherokee
version=1.2.101 version=1.2.101
revision=1
distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz" distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz"
build_style=gnu-configure build_style=gnu-configure
configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
--disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd --disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd
--with-wwwgroup=httpd --with-python=python --with-wwwgroup=httpd --with-python=python --enable-os-string=Linux"
--enable-os-string=Linux" short_desc="An innovative, feature rich, and yet easy to configure open source Web Server"
short_desc="An innovative, feature rich, and yet easy to configure open source Web Server."
maintainer="davehome <davehome@redthumb.info.tm>" maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.cherokee-project.com/" homepage="http://www.cherokee-project.com/"
license="GPL-2" license="GPL-2"
@ -24,42 +24,35 @@ long_desc="
subpackages="${pkgname}-devel lib${pkgname}" subpackages="${pkgname}-devel lib${pkgname}"
conf_files=" conf_files="/etc/${pkgname}/${pkgname}.conf"
/etc/cherokee/cherokee.conf"
systemd_services="cherokee.service on" systemd_services="cherokee.service on"
make_dirs="
/etc/cherokee/ssl 0755 httpd httpd
/var/log/cherokee 0755 httpd httpd
/var/lib/cherokee/graphs/images 0755 httpd httpd"
system_accounts="httpd" system_accounts="httpd"
httpd_descr="Cherokee HTTP server" httpd_descr="Cherokee HTTP server"
httpd_homedir="/srv/httpd" httpd_homedir="/srv/httpd"
Add_dependency build coreutils Add_dependency build coreutils
Add_dependency build gettext Add_dependency build gettext
Add_dependency build pcre-devel
Add_dependency build python-devel
Add_dependency build libldap-devel Add_dependency build libldap-devel
Add_dependency build pam-devel Add_dependency build pam-devel
Add_dependency build libmysqlclient-devel Add_dependency build libmysqlclient-devel
Add_dependency build ffmpeg-devel Add_dependency build ffmpeg-devel
Add_dependency build geoip-devel Add_dependency build geoip-devel
Add_dependency full python pre_configure() {
pre_configure()
{
# use /var/log/cherokee instead of /var/log # use /var/log/cherokee instead of /var/log
sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' \
cherokee.conf.sample.pre
} }
post_install() post_install() {
{
# Setup logrotate thing # Setup logrotate thing
vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d ${pkgname} vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d ${pkgname}
# Install systemd service # Install systemd service
vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system
vinstall ${FILESDIR}/${pkgname}.tmpfiles.d 644 \
usr/lib/tmpfiles.d ${pkgname}.conf
} }