Author: glen Date: Sat Sep 17 00:41:05 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged 1.0.2rc1 from DEVEL
- using %{_hordeapp} macro
---- Files affected:
SPECS:
ingo.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/ingo.spec
diff -u SPECS/ingo.spec:1.6 SPECS/ingo.spec:1.7
--- SPECS/ingo.spec:1.6 Thu Jul 21 00:07:56 2005
+++ SPECS/ingo.spec Sat Sep 17 02:40:59 2005
@@ -1,18 +1,24 @@
# $Revision$, $Date$
+%define _hordeapp ingo
+#define _snap 2005-08-26
+%define _rc rc1
+%define _rel 1
+#
%include /usr/lib/rpm/macros.php
Summary: Ingo - an email filter rules manager
Summary(pl): Ingo - zarządca reguł filtrowania poczty elektronicznej
-Name: ingo
-Version: 1.0.1
-Release: 1.1
+Name: %{_hordeapp}
+Version: 1.0.2
+Release: %{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
License: GPL v2
Group: Applications/WWW
-Source0: http://ftp.horde.org/pub/ingo/%{name}-h3-%{version}.tar.gz
-# Source0-md5: 7fce229d752e5b981621e215e4fc56e8
-Source1: %{name}.conf
-Patch0: %{name}-path.patch
+Source0:
ftp://ftp.horde.org/pub/ingo/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
+# Source0-md5: 3350a61407259492e11319251ae4ab7c
+Source1: %{_hordeapp}.conf
+Patch0: %{_hordeapp}-path.patch
URL: http://www.horde.org/ingo/
BuildRequires: rpmbuild(macros) >= 1.226
+BuildRequires: tar >= 1:1.15.1
Requires: apache >= 1.3.33-2
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -23,9 +29,9 @@
%define _noautocompressdoc CREDITS
%define _noautoreq 'pear(Horde.*)'
-%define hordedir /usr/share/horde
-%define _appdir %{hordedir}/%{name}
+%define hordedir %{_datadir}/horde
%define _sysconfdir /etc/horde.org
+%define _appdir %{hordedir}/%{_hordeapp}
%description
Ingo currently supports the following filtering drivers:
@@ -55,7 +61,8 @@
<http://www.horde.org/>.
%prep
-%setup -q -n %{name}-h3-%{version}
+%setup -q -c -T -n
%{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+tar zxf %{SOURCE0} --strip-components=1
%patch0 -p1
# considered harmful (horde/docs/SECURITY)
@@ -63,47 +70,42 @@
%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}
+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
-cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-
-echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
-sed -e '
-
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
+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
%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
@@ -111,12 +113,12 @@
%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) %{_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
@@ -133,6 +135,20 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2005/09/17 00:40:59 glen
+- merged 1.0.2rc1 from DEVEL
+- using %{_hordeapp} macro
+
+Revision 1.6.4.3 2005/08/30 18:28:49 paszczus
+- updated to 1.0.2rc1
+
+Revision 1.6.4.2 2005/08/27 09:39:47 paszczus
+- it is a snap of 1.1 version
+
+Revision 1.6.4.1 2005/08/27 09:35:39 paszczus
+- updated to 2005-08-26 snap (many changes were made)
+- release 1
+
Revision 1.6 2005/07/20 22:07:56 glen
- use apache config triggers
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
