Author: glen Date: Sun Jun 11 21:03:11 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- source alter should be in %prep; cosmetics
---- Files affected:
SPECS:
calamaris.spec (1.50 -> 1.51)
---- Diffs:
================================================================
Index: SPECS/calamaris.spec
diff -u SPECS/calamaris.spec:1.50 SPECS/calamaris.spec:1.51
--- SPECS/calamaris.spec:1.50 Sun Jun 11 17:24:59 2006
+++ SPECS/calamaris.spec Sun Jun 11 23:03:05 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# TODO:
# - think about default directory for calamaris output (somwhere in /var) so
# it works out-of-the-box
@@ -18,12 +17,13 @@
Source2: %{name}.sysconfig
Source3: %{name}-croniface
URL: http://cord.de/tools/squid/calamaris/Welcome.html
+BuildRequires: sed >= 4.0
Requires: /bin/zcat
Requires: /etc/cron.d
Requires: crontabs
Requires: setup >= 2.4.6
-Conflicts: squid < 7:2.5.STABLE7-5
Conflicts: logrotate < 3.7-3
+Conflicts: squid < 7:2.5.STABLE7-5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -38,13 +38,10 @@
%prep
%setup -q
+%{__sed} -i -e 's/use ident/use the ident/' calamaris calamaris.conf
%install
rm -rf $RPM_BUILD_ROOT
-for i in calamaris calamaris.conf ; do
- sed 's/use ident/use the ident/' < $i > $i.new
- mv $i.new $i
-done
install -d
$RPM_BUILD_ROOT{/etc/{cron.d,sysconfig},%{_bindir},%{_sbindir},%{_mandir}/man1}
@@ -72,6 +69,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.51 2006/06/11 21:03:05 glen
+- source alter should be in %prep; cosmetics
+
Revision 1.50 2006/06/11 15:24:59 undefine
- very bad patch to workaround to rpm-perlreq bug in pld by pi3ter
@@ -141,7 +141,7 @@
- 2.49, STBR
Revision 1.28 2002/04/25 15:56:54 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.27 2002/04/14 13:34:30 migo
- %include /usr/lib/rpm/macros.perl to autogenerate perl dependencies
@@ -162,7 +162,7 @@
- updated to 2.45 (few enhanctments but mostly bugfixes).
Revision 1.22 2002/01/18 02:12:32 kloczek
-perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
+- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
Revision 1.21 2001/10/26 17:04:25 grzegorz
- reverting last changes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/calamaris.spec?r1=1.50&r2=1.51&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
