Author: glen Date: Fri Sep 16 22:16:40 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %{_hordeapp} macro
---- Files affected:
SPECS:
chora.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SPECS/chora.spec
diff -u SPECS/chora.spec:1.35 SPECS/chora.spec:1.36
--- SPECS/chora.spec:1.35 Tue Aug 30 20:32:33 2005
+++ SPECS/chora.spec Sat Sep 17 00:16:35 2005
@@ -1,18 +1,22 @@
# $Revision$, $Date$
+%define _hordeapp chora
%define _rc rc1
+%define _rel 2
+
%include /usr/lib/rpm/macros.php
Summary: Web Based CVS Program
Summary(pl): Program do obsługi CVS przez WWW
Name: chora
Version: 2.0.1
-Release: 0.%{_rc}.1
+Release: %{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
License: GPL v2
Group: Applications/WWW
-Source0:
ftp://ftp.horde.org/pub/chora/%{name}-h3-%{version}-%{_rc}.tar.gz
+Source0:
ftp://ftp.horde.org/pub/chora/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
# Source0-md5: d7956bc6a2c293d29aa609865acdb5e9
-Source1: %{name}.conf
+Source1: %{_hordeapp}.conf
URL: http://www.horde.org/chora/
BuildRequires: rpmbuild(macros) >= 1.226
+BuildRequires: tar >= 1:1.15.1
Requires: apache >= 1.3.33-2
Requires: apache(mod_access)
# well. depending on configuration, it needs cvs, rcs or svn, cvsps >= 2.0b6
@@ -24,10 +28,10 @@
# horde accesses it directly in help->about
%define _noautocompressdoc CREDITS
-%define _noautoreq 'pear(Horde.*)'
+%define _noautoreq 'pear(Horde.*)'
%define hordedir /usr/share/horde
-%define _appdir %{hordedir}/%{name}
+%define _appdir %{hordedir}/%{_hordeapp}
%define _sysconfdir /etc/horde.org
%description
@@ -47,52 +51,52 @@
do IMP-a) zajrzyj na stronę <http://www.horde.org/>.
%prep
-%setup -q -n %{name}-h3-%{version}-%{_rc}
+%setup -q -c -T -n
%{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+tar zxf %{SOURCE0} --strip-components=1
%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}
cp -pR *.php $RPM_BUILD_ROOT%{_appdir}
for i in config/*.dist; do
- cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
+ cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
done
-cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
+echo "<?php ?>" >
$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
sed -e '
s,/usr/local/bin/cvsps,/usr/bin/cvsps,
-
s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{name}/cvsgraph.conf,
-' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
+
s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{_hordeapp}/cvsgraph.conf,
+' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+> $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
+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-%{name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
%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
%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
@@ -100,14 +104,14 @@
%files
%defattr(644,root,root,755)
%doc README docs/*
-%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) %config(noreplace) %{_sysconfdir}/%{name}/*.txt
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
-%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) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/*.txt
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/*.conf
+%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml
%dir %{_appdir}
%{_appdir}/*.php
@@ -124,6 +128,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2005/09/16 22:16:35 glen
+- use %{_hordeapp} macro
+
Revision 1.35 2005/08/30 18:32:33 paszczus
- updated to 2.0.1rc1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/chora.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
