SPECS: imp.spec - unify
glen
glen at pld-linux.org
Sat Sep 17 17:03:59 CEST 2005
Author: glen Date: Sat Sep 17 15:03:59 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify
---- Files affected:
SPECS:
imp.spec (1.85 -> 1.86)
---- Diffs:
================================================================
Index: SPECS/imp.spec
diff -u SPECS/imp.spec:1.85 SPECS/imp.spec:1.86
--- SPECS/imp.spec:1.85 Fri Sep 16 23:57:29 2005
+++ SPECS/imp.spec Sat Sep 17 17:03:54 2005
@@ -1,9 +1,9 @@
# $Revision$, $Date$
-%define _hordeapp imp
+%define _hordeapp imp
#define _snap 2005-08-22
-%define _rc rc1
-%define _rel 6
-
+%define _rc rc1
+%define _rel 6.1
+#
%include /usr/lib/rpm/macros.php
Summary: Web Based IMAP Mail Program
Summary(es): Programa de correo vía Internet basado en IMAP
@@ -34,9 +34,9 @@
%define _noautocompressdoc CREDITS
%define _noautoreq 'pear(Horde.*)' 'pear(Text/Flowed.php)'
-%define hordedir /usr/share/horde
-%define _sysconfdir /etc/horde.org
-%define _appdir %{hordedir}/%{_hordeapp}
+%define hordedir /usr/share/horde
+%define _sysconfdir /etc/horde.org
+%define _appdir %{hordedir}/%{_hordeapp}
%description
IMP is the Internet Messaging Program, one of the Horde components. It
@@ -65,24 +65,26 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
+sed -i -e '
+ s,/somewhere/ca-bundle.crt,/usr/share/ssl/ca-bundle.crt,
+ s,/usr/local/bin,%{_bindir},
+' config/conf.xml
+
# considered harmful (horde/docs/SECURITY)
rm -f test.php
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
-cp -pR *.php $RPM_BUILD_ROOT%{_appdir}
+cp -a *.php $RPM_BUILD_ROOT%{_appdir}
for i in config/*.dist; do
- cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
+ cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
done
-echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
-sed -e '
- s,/somewhere/ca-bundle.crt,/usr/share/ssl/ca-bundle.crt,
- s,/usr/local/bin,%{_bindir},
-' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
@@ -91,7 +93,6 @@
ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
%clean
@@ -158,6 +159,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.86 2005/09/17 15:03:54 glen
+- unify
+
Revision 1.85 2005/09/16 21:57:29 glen
- use %{_hordeapp} macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.85&r2=1.86&f=u
More information about the pld-cvs-commit
mailing list