[sysstat] - remove needless DOCDIR setting - remove needless INIT_DIR setting - fix the problem with --disable
Ivana Varekova
varekova at fedoraproject.org
Tue Sep 21 08:36:10 UTC 2010
commit 3688b8e7bf688d4921dd55cd7fa9e5e23373ec4a
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date: Tue Sep 21 10:39:01 2010 +0200
- remove needless DOCDIR setting
- remove needless INIT_DIR setting
- fix the problem with --disable-man-group option
sysstat.spec | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/sysstat.spec b/sysstat.spec
index f8a4c5a..dca63a9 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
Name: sysstat
Version: 9.0.6.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The sar and iostat system monitoring commands
License: GPLv2+
Group: Applications/System
@@ -16,6 +16,7 @@ Patch3: sysstat-9.0.6.1-tickless.patch
Patch4: sysstat-9.0.6.1-sec.patch
Patch5: sysstat-9.0.6.1-mp_isag.patch
Patch6: sysstat-9.0.6.1-sar-tickless.patch
+Patch7: sysstat-9.0.6.1-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,21 +39,19 @@ activity.
%patch4 -p1 -b .sec
%patch5 -p1 -b .isag
%patch6 -p1 -b .tl2
+%patch7 -p1 -b .dmg
iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
mv CREDITS.aux CREDITS
%build
-# FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and
-# send the upstream maintainer a patch.
-# add DOCDIR to the configure part
-./configure --disable-man-group --prefix=%{_prefix} --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa --libdir=%{_libdir}
+autoreconf -fi
+./configure --prefix=%{_prefix} --disable-man-group --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa --libdir=%{_libdir}
CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
-make CFLAGS="$CFLAGS" LFLAGS="" DOC_DIR=%{_docdir}/%{name}-%{version}
+make CFLAGS="$CFLAGS" LFLAGS=""
%install
rm -rf %{buildroot}
-
-make install IGNORE_MAN_GROUP=y DOC_DIR=%{_docdir}/%{name}-%{version} INIT_DIR=%{_initrddir}
+make install
mkdir -p %{buildroot}/%{_sysconfdir}/cron.d
install -m 0644 sysstat.crond %{buildroot}/%{_sysconfdir}/cron.d/sysstat
@@ -89,6 +88,11 @@ rm -rf %{buildroot}
%{_localstatedir}/log/sa
%changelog
+* Tue Sep 21 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6.1-7
+- remove needless DOCDIR setting
+- remove needless INIT_DIR setting
+- fix the problem with --disable-man-group option
+
* Wed Sep 8 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6.1-6
- fix the sar output on tickless kernel
More information about the scm-commits
mailing list