Author: glen Date: Wed Nov 30 22:39:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - patch prefs.xml
---- Files affected: SPECS: horde-imp.spec (1.96 -> 1.97) , horde-chora.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/horde-imp.spec diff -u SPECS/horde-imp.spec:1.96 SPECS/horde-imp.spec:1.97 --- SPECS/horde-imp.spec:1.96 Wed Nov 30 23:32:13 2005 +++ SPECS/horde-imp.spec Wed Nov 30 23:39:38 2005 @@ -2,7 +2,7 @@ %define _hordeapp imp #define _snap 2005-08-22 #define _rc rc2 -%define _rel 1.14 +%define _rel 1.15 # %include /usr/lib/rpm/macros.php Summary: Web Based IMAP Mail Program @@ -20,6 +20,7 @@ #Source0: ftp://ftp.horde.org/pub/imp/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz Source1: %{_hordeapp}.conf Patch0: %{_hordeapp}-path.patch +Patch1: %{_hordeapp}-prefs.patch URL: http://www.horde.org/imp/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -70,6 +71,7 @@ %setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 %patch0 -p1 +%patch1 -p1 rm -f {,*/}.htaccess for i in config/*.dist; do @@ -78,12 +80,6 @@ # considered harmful (horde/docs/SECURITY) rm -f test.php -sed -i -e ' - s,/somewhere/ca-bundle.crt,/''usr/share/ssl/ca-bundle.crt, - s,/''usr/local/bin,%{_bindir}, -' config/conf.xml - - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs} @@ -198,6 +194,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97 2005/11/30 22:39:38 glen +- patch prefs.xml + Revision 1.96 2005/11/30 22:32:13 glen - simplify and unify ================================================================ Index: SPECS/horde-chora.spec diff -u SPECS/horde-chora.spec:1.45 SPECS/horde-chora.spec:1.46 --- SPECS/horde-chora.spec:1.45 Wed Nov 30 23:32:13 2005 +++ SPECS/horde-chora.spec Wed Nov 30 23:39:38 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ %define _hordeapp chora #define _rc rc1 -%define _rel 1.2 +%define _rel 1.4 # %include /usr/lib/rpm/macros.php Summary: Web Based CVS Program @@ -15,6 +15,7 @@ Source0: ftp://ftp.horde.org/pub/chora/%{_hordeapp}-h3-%{version}.tar.gz # Source0-md5: 8f3f3e81c839e6f13b797ab911b53652 Source1: %{_hordeapp}.conf +Patch0: %{_hordeapp}-prefs.patch URL: http://www.horde.org/chora/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -59,18 +60,13 @@ %prep %setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 +%patch0 -p1 rm -f {,*/}.htaccess for i in config/*.dist; do mv $i config/$(basename $i .dist) done -# TODO create patch -sed -i -e ' - s,/''usr/local/bin/cvsps,%{_bindir}/cvsps, - s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/cvsgraph.conf, -' config/conf.xml - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs} @@ -164,6 +160,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46 2005/11/30 22:39:38 glen +- patch prefs.xml + Revision 1.45 2005/11/30 22:32:13 glen - simplify and unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.96&r2=1.97&f=u http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
