SPECS: horde-chora.spec, horde-giapeto.spec, horde-gollem.spec, ho...
glen
glen at pld-linux.org
Wed Nov 30 22:21:28 CET 2005
Author: glen Date: Wed Nov 30 21:21:28 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify
---- Files affected:
SPECS:
horde-chora.spec (1.43 -> 1.44) , horde-giapeto.spec (1.6 -> 1.7) , horde-gollem.spec (1.17 -> 1.18) , horde-imp.spec (1.93 -> 1.94) , horde-ingo.spec (1.14 -> 1.15) , horde-jonah.spec (1.6 -> 1.7) , horde-klutz.spec (1.10 -> 1.11) , horde-kronolith.spec (1.29 -> 1.30) , horde-mimp.spec (1.14 -> 1.15) , horde-mnemo.spec (1.11 -> 1.12) , horde-nag.spec (1.12 -> 1.13) , horde-passwd.spec (1.38 -> 1.39) , horde-turba.spec (1.56 -> 1.57) , horde-ulaform.spec (1.5 -> 1.6) , horde-whups.spec (1.15 -> 1.16) , horde-wicked.spec (1.12 -> 1.13) , horde.spec (1.121 -> 1.122) , template-horde.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.43 SPECS/horde-chora.spec:1.44
--- SPECS/horde-chora.spec:1.43 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-chora.spec Wed Nov 30 22:21:18 2005
@@ -78,10 +78,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -166,6 +166,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44 2005/11/30 21:21:18 glen
+- unify
+
Revision 1.43 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.6 SPECS/horde-giapeto.spec:1.7
--- SPECS/horde-giapeto.spec:1.6 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-giapeto.spec Wed Nov 30 22:21:19 2005
@@ -59,7 +59,7 @@
Giapeto) można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
# considered harmful (horde/docs/SECURITY)
@@ -78,12 +78,12 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-cp -pR bookmarks/* $RPM_BUILD_ROOT%{_appdir}/bookmarks
-cp -pR perms/* $RPM_BUILD_ROOT%{_appdir}/perms
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -179,6 +179,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.6 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.17 SPECS/horde-gollem.spec:1.18
--- SPECS/horde-gollem.spec:1.17 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-gollem.spec Wed Nov 30 22:21:19 2005
@@ -59,7 +59,7 @@
Gollema) można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
@@ -79,10 +79,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -142,7 +142,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/*
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -166,6 +166,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.17 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.93 SPECS/horde-imp.spec:1.94
--- SPECS/horde-imp.spec:1.93 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-imp.spec Wed Nov 30 22:21:19 2005
@@ -2,7 +2,7 @@
%define _hordeapp imp
#define _snap 2005-08-22
#define _rc rc2
-%define _rel 1.12
+%define _rel 1.13
#
%include /usr/lib/rpm/macros.php
Summary: Web Based IMAP Mail Program
@@ -67,7 +67,7 @@
Programa de Mail via Web baseado no IMAP.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
@@ -82,7 +82,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
+ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
cp -a *.php $RPM_BUILD_ROOT%{_appdir}
for i in config/*.dist; do
@@ -92,10 +92,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -175,7 +175,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/* scripts
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -199,6 +199,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.94 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.93 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.14 SPECS/horde-ingo.spec:1.15
--- SPECS/horde-ingo.spec:1.14 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-ingo.spec Wed Nov 30 22:21:19 2005
@@ -66,7 +66,7 @@
<http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
@@ -86,10 +86,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -149,7 +149,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/*
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -172,6 +172,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.14 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.6 SPECS/horde-jonah.spec:1.7
--- SPECS/horde-jonah.spec:1.6 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-jonah.spec Wed Nov 30 22:21:19 2005
@@ -52,7 +52,7 @@
pogodą i innymi rodzajami treści.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
# considered harmful (horde/docs/SECURITY)
@@ -74,14 +74,14 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-cp -pR channels/* $RPM_BUILD_ROOT%{_appdir}/channels
-cp -pR delivery/* $RPM_BUILD_ROOT%{_appdir}/delivery
-cp -pR lists/* $RPM_BUILD_ROOT%{_appdir}/lists
-cp -pR stories/* $RPM_BUILD_ROOT%{_appdir}/stories
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -151,7 +151,7 @@
%files
%defattr(644,root,root,755)
%doc LICENSE README docs/* scripts
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -179,6 +179,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.6 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.10 SPECS/horde-klutz.spec:1.11
--- SPECS/horde-klutz.spec:1.10 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-klutz.spec Wed Nov 30 22:21:19 2005
@@ -56,7 +56,7 @@
Klutza) można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
# considered harmful (horde/docs/SECURITY)
@@ -77,10 +77,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -150,7 +150,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/* scripts
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -174,6 +174,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.10 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.29 SPECS/horde-kronolith.spec:1.30
--- SPECS/horde-kronolith.spec:1.29 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-kronolith.spec Wed Nov 30 22:21:19 2005
@@ -72,7 +72,7 @@
PostgreSQL, Oracle i MS SQL poprzez PEAR DB), MCAL i Kolab.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%install
@@ -88,10 +88,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -161,7 +161,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/* scripts/*
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -184,6 +184,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.29 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.14 SPECS/horde-mimp.spec:1.15
--- SPECS/horde-mimp.spec:1.14 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-mimp.spec Wed Nov 30 22:21:19 2005
@@ -61,7 +61,7 @@
MIMP-a) można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
@@ -82,10 +82,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -145,7 +145,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/*
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -169,6 +169,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.14 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.11 SPECS/horde-mnemo.spec:1.12
--- SPECS/horde-mnemo.spec:1.11 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-mnemo.spec Wed Nov 30 22:21:19 2005
@@ -2,7 +2,7 @@
%define _hordeapp mnemo
#define _snap 2005-08-01
#define _rc rc1
-%define _rel 1.1
+%define _rel 1.2
#
%include /usr/lib/rpm/macros.php
Summary: Horde notes and memos application
@@ -60,14 +60,14 @@
Mnemo) można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
+ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
cp -a *.php $RPM_BUILD_ROOT%{_appdir}
for i in config/*.dist; do
@@ -77,10 +77,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -149,7 +149,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/* scripts
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -172,6 +172,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.11 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.12 SPECS/horde-nag.spec:1.13
--- SPECS/horde-nag.spec:1.12 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-nag.spec Wed Nov 30 22:21:19 2005
@@ -57,7 +57,7 @@
można znaleźć na stronie <http://www.horde.org/>.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
%install
@@ -73,10 +73,10 @@
cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/conf.xml
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
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
@@ -145,7 +145,7 @@
%files
%defattr(644,root,root,755)
%doc README docs/* scripts
-%attr(750,root,http) %dir %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/httpd.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/conf.php
@@ -168,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2005/11/30 21:21:19 glen
+- unify
+
Revision 1.12 2005/11/30 12:50:45 glen
- conf.xml is not %config(noreplace) so it should not be rescued in trigger
================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.38 SPECS/horde-passwd.spec:1.39
--- SPECS/horde-passwd.spec:1.38 Wed Nov 30 13:50:45 2005
+++ SPECS/horde-passwd.spec Wed Nov 30 22:21:19 2005
@@ -2,7 +2,7 @@
%define _hordeapp passwd
#define _snap 2005-09-10
#define _rc rc1
-%define _rel 2.1
+%define _rel 2.2
#
%include /usr/lib/rpm/macros.php
Summary: passwd - password change module for Horde
@@ -52,7 +52,7 @@
moduł.
%prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
rm -f scripts/.htaccess
@@ -62,20 +62,20 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir} \
- $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
+ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,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}/$(basename $i .dist)
+ 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 -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
-cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates
-cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+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
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.43&r2=1.44&f=u
http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.93&r2=1.94&f=u
http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.38&r2=1.39&f=u
http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.56&r2=1.57&f=u
http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.121&r2=1.122&f=u
http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list