SPECS: swatch.spec - we have %{_examplesdir} - correct deps, add a...
glen
glen at pld-linux.org
Wed Sep 13 18:04:43 CEST 2006
Author: glen Date: Wed Sep 13 16:04:43 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- we have %{_examplesdir}
- correct deps, add autodeps bcond
---- Files affected:
SPECS:
swatch.spec (1.28 -> 1.29)
---- Diffs:
================================================================
Index: SPECS/swatch.spec
diff -u SPECS/swatch.spec:1.28 SPECS/swatch.spec:1.29
--- SPECS/swatch.spec:1.28 Wed Sep 13 17:25:08 2006
+++ SPECS/swatch.spec Wed Sep 13 18:04:38 2006
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without autodeps # don't BR packages needed only for resolving deps
+#
%include /usr/lib/rpm/macros.perl
Summary: A utility for monitoring system logs files
Summary(pl): Narzędzie do monitorowania logów systemowych
@@ -11,11 +15,16 @@
Source1: %{name}rc
# Source0-md5: e55db93ef6250d684a56104fd03b8821
URL: http://swatch.sourceforge.net/
-BuildRequires: perl-Time-HiRes >= 1.12
+BuildRequires: perl-base
+BuildRequires: perl-devel
+BuildRequires: rpm-perlprov
+%if %{with autodeps}
BuildRequires: perl-Date-Calc
+BuildRequires: perl-Date-Manip
BuildRequires: perl-File-Tail
+BuildRequires: perl-Time-HiRes >= 1.12
BuildRequires: perl-TimeDate
-Requires: perl-Date-Manip
+%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,12 +51,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-
-install %{SOURCE1} examples
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/swatch/.packlist}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -62,6 +72,7 @@
%dir %{perl_vendorlib}/auto/Swatch
%dir %{perl_vendorlib}/auto/Swatch/Actions
%{perl_vendorlib}/auto/Swatch/Actions/autosplit.ix
+%{_examplesdir}/%{name}-%{version}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -69,8 +80,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2006/09/13 16:04:38 glen
+- we have %{_examplesdir}
+- correct deps, add autodeps bcond
+
Revision 1.28 2006/09/13 15:25:08 darekr
-- added example config file (Source1) to _defaultdocdir/exmaples dir
+- added example config file (Source1) to _docdir/examples dir
Revision 1.27 2006/09/13 15:06:44 darekr
- updated to 3.2.1, R: perl-Date-Manip
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/swatch.spec?r1=1.28&r2=1.29&f=u
More information about the pld-cvs-commit
mailing list