Author: glen Date: Sat Sep 17 11:45:38 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %{_hordeapp} macro, remove bogus dep, fix version
---- Files affected:
SPECS:
turba.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/turba.spec
diff -u SPECS/turba.spec:1.46 SPECS/turba.spec:1.47
--- SPECS/turba.spec:1.46 Sat Sep 17 00:38:20 2005
+++ SPECS/turba.spec Sat Sep 17 13:45:33 2005
@@ -1,24 +1,23 @@
# $Revision$, $Date$
-#define _rc rc1
+%define _hordeapp turba
%define _snap 2005-08-25
+#define _rc rc1
%define _rel 1
#
%include /usr/lib/rpm/macros.php
Summary: TURBA - Address book for IMP
Summary(pl): TURBA - Książka adresowa dla IMP-a
-Name: turba
-Version: 2.0.3
-Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Name: %{_hordeapp}
+Version: 2.1
+Release: %{?_rc:1.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
License: ASL
Vendor: The Horde Project
Group: Applications/WWW
-Requires: %{name} = %{version}-%{release}
-#Source0: ftp://ftp.horde.org/pub/turba/%{name}-h3-%{version}.tar.gz
-Source0:
ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz
+#Source0:
ftp://ftp.horde.org/pub/turba/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
+Source0:
ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
# Source0-md5: dedab86cf74caf49f786f914f49ea8aa
-#Source0:
ftp://ftp.horde.org/pub/turba/%{name}-h3-%{version}-%{_rc}.tar.gz
-Source1: %{name}.conf
-Source2: %{name}-trans.mo
+Source1: %{_hordeapp}.conf
+Source2: %{_hordeapp}-trans.mo
URL: http://www.horde.org/turba/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.177
@@ -37,9 +36,9 @@
%define _noautoreq 'pear(Horde.*)' 'pear(Net/IMSP.php)'
'pear(Net/IMSP/Utils.php)'
%define hordedir /usr/share/horde
-%define schemadir /usr/share/openldap/schema
%define _sysconfdir /etc/horde.org
-%define _appdir %{hordedir}/%{name}
+%define _appdir %{hordedir}/%{_hordeapp}
+%define schemadir /usr/share/openldap/schema
%description
Turba is a complete basic contact management application. SQL, LDAP,
@@ -83,7 +82,7 @@
<ftp://kalamazoolinux.org/pub/projects/awilliam/ldap/schema/>.
%prep
-%setup -q -c -T -n
%{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}}
+%setup -q -c -T -n
%{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
tar zxf %{SOURCE0} --strip-components=1
# considered harmful (horde/docs/SECURITY)
@@ -91,38 +90,36 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \
$RPM_BUILD_ROOT%{schemadir}
-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}/%{name}/$(basename $i .dist)
+ cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
done
-echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
-cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/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
cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates
cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config
-ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS
$RPM_BUILD_ROOT%{_appdir}/docs
-
-install %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
+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
install %{SOURCE2}
$RPM_BUILD_ROOT%{_appdir}/locale/pl_PL/LC_MESSAGES/turba.mo
-
install scripts/ldap/rfc2739.schema $RPM_BUILD_ROOT%{schemadir}
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then
- install /dev/null -o root -g http -m660
%{_sysconfdir}/%{name}/conf.php.bak
+if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then
+ install /dev/null -o root -g http -m660
%{_sysconfdir}/%{_hordeapp}/conf.php.bak
fi
if [ "$1" = 1 ]; then
@@ -169,12 +166,12 @@
%triggerpostun -- turba <= 1.2.2-2
if [ -f /etc/httpd/httpd.conf ]; then
- sed -i -e '/^Include.*%{name}.conf/d' /etc/httpd/httpd.conf
+ sed -i -e '/^Include.*turba.conf/d' /etc/httpd/httpd.conf
fi
-if [ -f %{_apache2dir}/%{name}.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
- mv -f %{_apache2dir}/%{name}.conf.rpmsave
%{_sysconfdir}/apache-%{name}.conf
+if [ -f /etc/httpd/turba.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache-%{_hordeapp}.conf{,.rpmnew}
+ mv -f /etc/httpd/turba.conf.rpmsave
%{_sysconfdir}/apache-%{_hordeapp}.conf
fi
if [ -f /var/lock/subsys/httpd ]; then
@@ -182,13 +179,13 @@
fi
%triggerin -- apache1 >= 1.3.33-2
-%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf
%triggerun -- apache1 >= 1.3.33-2
%apache_config_uninstall -v 1
%triggerin -- apache >= 2.0.0
-%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf
%triggerun -- apache >= 2.0.0
%apache_config_uninstall -v 2
@@ -196,12 +193,12 @@
%files
%defattr(644,root,root,755)
%doc LICENSE README docs/* scripts/*.reg scripts/ldap scripts/sql
-%attr(750,root,http) %dir %{_sysconfdir}/%{name}
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
-%attr(660,root,http) %config(noreplace) %ghost
%{_sysconfdir}/%{name}/conf.php.bak
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php
-%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
+%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp}
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php
+%attr(660,root,http) %config(noreplace) %ghost
%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php
+%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml
%dir %{_appdir}
%{_appdir}/*.php
@@ -222,6 +219,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2005/09/17 11:45:33 glen
+- use %{_hordeapp} macro, remove bogus dep, fix version
+
Revision 1.46 2005/09/16 22:38:20 glen
- fix php epoch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/turba.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
