Author: glen Date: Mon Mar 27 14:43:22 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - patches from http://sourceforge.net/tracker/index.php?func=detail&aid=1457860&group_id=136248&atid=734752
---- Files affected: SPECS: nagios-fruity.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/nagios-fruity.spec diff -u SPECS/nagios-fruity.spec:1.14 SPECS/nagios-fruity.spec:1.15 --- SPECS/nagios-fruity.spec:1.14 Sun Mar 12 18:20:39 2006 +++ SPECS/nagios-fruity.spec Mon Mar 27 16:43:17 2006 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _rc rc1 -%define _rel 0.3 +%define _rel 0.4 Summary: Nagios Configuration Tool Summary(pl): Narzędzie konfiguracyjne dla Nagiosa Name: nagios-fruity @@ -10,6 +10,8 @@ Group: Applications/WWW Source0: http://dl.sourceforge.net/fruity/fruity-%{version}-%{_rc}.tar.gz # Source0-md5: 5571da4c337dab1a189b0fcaf795dfc9 +Source1: patches.tar.bz2 +# Source1-md5: e8d7825cdfdb2ffdbb5f54f38cd3b1d2 Patch0: %{name}-adodb.patch URL: http://fruity.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.264 @@ -38,7 +40,8 @@ Narzędzie konfiguracyjne dla Nagiosa. %prep -%setup -q -n fruity-%{version}-%{_rc} +%setup -q -n fruity-%{version}-%{_rc} -a1 + mv includes/config.inc{,.dist} rm -r config # no longer used rm -rf includes/adodb # using system adodb @@ -46,6 +49,9 @@ # undos the source find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 sed -i -e 's,\r$,,' +find patch -name '*.patch' | xargs sed -i -e 's,\r$,,' +find patch -name '*.patch' | xargs cat | patch -p1 + %patch0 -p1 cat <<EOF > apache.conf @@ -116,6 +122,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2006/03/27 14:43:17 glen +- patches from http://sourceforge.net/tracker/index.php?func=detail&aid=1457860&group_id=136248&atid=734752 + Revision 1.14 2006/03/12 17:20:39 glen - really use system adodb ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nagios-fruity.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
