Author: glen Date: Wed Apr 5 20:44:24 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed packaging - added uidlist automatic fill from horde-passwd - rel 3
---- Files affected: SPECS: horde-vacation.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/horde-vacation.spec diff -u SPECS/horde-vacation.spec:1.7 SPECS/horde-vacation.spec:1.8 --- SPECS/horde-vacation.spec:1.7 Wed Apr 5 18:43:09 2006 +++ SPECS/horde-vacation.spec Wed Apr 5 22:44:19 2006 @@ -1,7 +1,7 @@ # $Revision$, $Date$ %define _hordeapp vacation -%define _rc rc1 -%define _rel 2 +%define _rc rc1 +%define _rel 3 # %include /usr/lib/rpm/macros.php Summary: vacation - vacation manager module for Horde @@ -15,12 +15,14 @@ Source0: ftp://ftp.horde.org/pub/vacation/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz # Source0-md5: 71c36a46f0463ba7c128a2103a4ec6ae Source1: %{name}.conf +Patch0: horde-vacation-conf.patch URL: http://www.horde.org/vacation/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: tar >= 1:1.15.1 +Requires(post): sed >= 4.0 Requires: horde >= 3.0 -Requires: php-xml >= 4.1.0 +Requires: php-xml >= 3:4.1.0 Requires: vacation Requires: webapps BuildArch: noarch @@ -60,28 +62,22 @@ %prep %setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 +%patch0 -p1 -rm -f {,*/}.htaccess -# considered harmful (horde/docs/SECURITY) -rm -f test.php +rm */.htaccess %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_sysconfdir} \ - $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates} - -cp -pR *.php $RPM_BUILD_ROOT%{_appdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs} +cp -a *.php $RPM_BUILD_ROOT%{_appdir} +cp -a config/* $RPM_BUILD_ROOT%{_sysconfdir} echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php -touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak - -cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib -cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale -cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates +touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak +cp -a lib locale templates themes $RPM_BUILD_ROOT%{_appdir} ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs - install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf @@ -93,6 +89,15 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak fi +# take uids with < 500 and update refused logins in default conf.xml +USERLIST=$(awk -F: '{ if ($3 < 500) print $1 }' < /etc/passwd | xargs | tr ' ' ',') +if [ "$USERLIST" ]; then + sed -i -e " + # primitive xml parser ;) + /configlist name=\"refused\"/s/>.*</>$USERLIST</ + " %{_sysconfdir}/conf.xml +fi + %triggerin -- apache1 %webapp_register apache %{_webapp} @@ -148,6 +153,7 @@ %{_appdir}/lib %{_appdir}/locale %{_appdir}/templates +%{_appdir}/themes %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -155,6 +161,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2006/04/05 20:44:19 glen +- fixed packaging +- added uidlist automatic fill from horde-passwd +- rel 3 + Revision 1.7 2006/04/05 16:43:09 baggins - rel 2 - added missing file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-vacation.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
