SPECS: horde-chora.spec, horde-giapeto.spec, horde-gollem.spec, ho...
glen
glen at pld-linux.org
Wed Nov 30 23:32:23 CET 2005
Author: glen Date: Wed Nov 30 22:32:23 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- simplify and unify
---- Files affected:
SPECS:
horde-chora.spec (1.44 -> 1.45) , horde-giapeto.spec (1.7 -> 1.8) , horde-gollem.spec (1.18 -> 1.19) , horde-imp.spec (1.95 -> 1.96) , horde-ingo.spec (1.15 -> 1.16) , horde-jonah.spec (1.7 -> 1.8) , horde-klutz.spec (1.11 -> 1.12) , horde-kronolith.spec (1.30 -> 1.31) , horde-mimp.spec (1.15 -> 1.16) , horde-mnemo.spec (1.12 -> 1.13) , horde-nag.spec (1.13 -> 1.14) , horde-passwd.spec (1.39 -> 1.40) , horde-trean.spec (1.12 -> 1.13) , horde-turba.spec (1.57 -> 1.58) , horde-ulaform.spec (1.6 -> 1.7) , horde-whups.spec (1.16 -> 1.17) , horde-wicked.spec (1.13 -> 1.14) , horde.spec (1.123 -> 1.124) , template-horde.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.44 SPECS/horde-chora.spec:1.45
--- SPECS/horde-chora.spec:1.44 Wed Nov 30 22:21:18 2005
+++ SPECS/horde-chora.spec Wed Nov 30 23:32:13 2005
@@ -1,7 +1,7 @@
# $Revision$, $Date$
%define _hordeapp chora
#define _rc rc1
-%define _rel 1.1
+%define _rel 1.2
#
%include /usr/lib/rpm/macros.php
Summary: Web Based CVS Program
@@ -60,6 +60,12 @@
%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
+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,
@@ -67,21 +73,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -166,6 +164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.44 2005/11/30 21:21:18 glen
- unify
================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.7 SPECS/horde-giapeto.spec:1.8
--- SPECS/horde-giapeto.spec:1.7 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-giapeto.spec Wed Nov 30 23:32:13 2005
@@ -2,7 +2,7 @@
%define _hordeapp giapeto
#define _rc rc1
%define _snap 2005-09-17
-%define _rel 0.5
+%define _rel 0.6
%include /usr/lib/rpm/macros.php
Summary: Web-site Content Management System
@@ -62,28 +62,22 @@
%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
# considered harmful (horde/docs/SECURITY)
rm -f test.php
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes,bookmarks,perms}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-cp -a bookmarks/* $RPM_BUILD_ROOT%{_appdir}/bookmarks
-cp -a perms/* $RPM_BUILD_ROOT%{_appdir}/perms
+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 -a lib locale templates themes bookmarks perms $RPM_BUILD_ROOT%{_appdir}
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -179,6 +173,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.7 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.18 SPECS/horde-gollem.spec:1.19
--- SPECS/horde-gollem.spec:1.18 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-gollem.spec Wed Nov 30 23:32:13 2005
@@ -63,26 +63,22 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
# considered harmful (horde/docs/SECURITY)
rm -f test.php
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -166,6 +162,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.18 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.95 SPECS/horde-imp.spec:1.96
--- SPECS/horde-imp.spec:1.95 Wed Nov 30 22:33:14 2005
+++ SPECS/horde-imp.spec Wed Nov 30 23:32:13 2005
@@ -2,7 +2,7 @@
%define _hordeapp imp
#define _snap 2005-08-22
#define _rc rc2
-%define _rel 1.13
+%define _rel 1.14
#
%include /usr/lib/rpm/macros.php
Summary: Web Based IMAP Mail Program
@@ -71,31 +71,28 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
+# 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
-# considered harmful (horde/docs/SECURITY)
-rm -f test.php
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -201,6 +198,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.96 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.95 2005/11/30 21:33:14 glen
- prevent rescued .rpmsave-s laying around
================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.15 SPECS/horde-ingo.spec:1.16
--- SPECS/horde-ingo.spec:1.15 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-ingo.spec Wed Nov 30 23:32:13 2005
@@ -70,26 +70,22 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
# considered harmful (horde/docs/SECURITY)
rm -f test.php
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -172,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.15 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.7 SPECS/horde-jonah.spec:1.8
--- SPECS/horde-jonah.spec:1.7 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-jonah.spec Wed Nov 30 23:32:13 2005
@@ -55,33 +55,22 @@
%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
# considered harmful (horde/docs/SECURITY)
rm -f test.php
-rm -f {locale,po}/.htaccess
-
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \
- $RPM_BUILD_ROOT%{_appdir}/{channels,delivery,lists,stories}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-cp -a channels/* $RPM_BUILD_ROOT%{_appdir}/channels
-cp -a delivery/* $RPM_BUILD_ROOT%{_appdir}/delivery
-cp -a lists/* $RPM_BUILD_ROOT%{_appdir}/lists
-cp -a stories/* $RPM_BUILD_ROOT%{_appdir}/stories
+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 -a lib locale templates themes channels delivery lists stories $RPM_BUILD_ROOT%{_appdir}
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -179,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.7 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.11 SPECS/horde-klutz.spec:1.12
--- SPECS/horde-klutz.spec:1.11 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-klutz.spec Wed Nov 30 23:32:13 2005
@@ -4,7 +4,7 @@
%define _hordeapp klutz
%define _snap 2005-08-01
#define _rc rc1
-%define _rel 0.3
+%define _rel 0.4
#
%include /usr/lib/rpm/macros.php
Summary: Horde comics-fetching module
@@ -59,28 +59,22 @@
%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
# considered harmful (horde/docs/SECURITY)
rm -f test.php
-rm -f scripts/.htaccess
-
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -174,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.11 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.30 SPECS/horde-kronolith.spec:1.31
--- SPECS/horde-kronolith.spec:1.30 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-kronolith.spec Wed Nov 30 23:32:13 2005
@@ -2,7 +2,7 @@
%define _hordeapp kronolith
#define _snap 2005-08-01
#define _rc rc1
-%define _rel 1.1
+%define _rel 1.2
#
%include /usr/lib/rpm/macros.php
Summary: Kronolith - calendar for Horde
@@ -75,23 +75,20 @@
%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -184,6 +181,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.31 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.30 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.15 SPECS/horde-mimp.spec:1.16
--- SPECS/horde-mimp.spec:1.15 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-mimp.spec Wed Nov 30 23:32:13 2005
@@ -2,7 +2,7 @@
%define _hordeapp mimp
%define _snap 2005-11-16
#define _rc rc1
-%define _rel 0.3
+%define _rel 0.5
#
%include /usr/lib/rpm/macros.php
Summary: MIMP - a stripped down version of IMP for use on mobile phones/PDAs
@@ -65,27 +65,22 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
-# Described in documentation as dangerous file...
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
+# considered harmful (horde/docs/SECURITY)
rm test.php
-rm config/.htaccess
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -169,6 +164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2005/11/30 22:32:13 glen
+- simplify and unify
+
Revision 1.15 2005/11/30 21:21:19 glen
- unify
================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.12 SPECS/horde-mnemo.spec:1.13
--- SPECS/horde-mnemo.spec:1.12 Wed Nov 30 22:21:19 2005
+++ SPECS/horde-mnemo.spec Wed Nov 30 23:32:13 2005
@@ -2,7 +2,7 @@
%define _hordeapp mnemo
#define _snap 2005-08-01
#define _rc rc1
-%define _rel 1.2
+%define _rel 1.3
#
%include /usr/lib/rpm/macros.php
Summary: Horde notes and memos application
@@ -64,23 +64,20 @@
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
+rm -f {,*/}.htaccess
+for i in config/*.dist; do
+ mv $i config/$(basename $i .dist)
+done
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs}
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-for i in config/*.dist; do
- cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i .dist)
-done
-echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
-touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
-
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -a templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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 -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
@@ -172,6 +169,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.44&r2=1.45&f=u
http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.95&r2=1.96&f=u
http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.30&r2=1.31&f=u
http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.39&r2=1.40&f=u
http://cvs.pld-linux.org/SPECS/horde-trean.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.57&r2=1.58&f=u
http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.123&r2=1.124&f=u
http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list