rpms/sysstat
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- remove needless DOCDIR setting

Browse Source 
- remove needless INIT_DIR setting
- fix the problem with --disable-man-group option
This commit is contained in:
Ivana Hutarova Varekova 2010-09-21 10:39:01 +02:00
parent 293f81efd6
commit 3688b8e7bf
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sysstat.spec
View File

@ -1,6 +1,6 @@
Name: sysstat Name: sysstat
Version: 9.0.6.1 Version: 9.0.6.1
Release: 6%{?dist} Release: 7%{?dist}
Summary: The sar and iostat system monitoring commands Summary: The sar and iostat system monitoring commands
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
@ -16,6 +16,7 @@ Patch3: sysstat-9.0.6.1-tickless.patch
Patch4: sysstat-9.0.6.1-sec.patch Patch4: sysstat-9.0.6.1-sec.patch
Patch5: sysstat-9.0.6.1-mp_isag.patch Patch5: sysstat-9.0.6.1-mp_isag.patch
Patch6: sysstat-9.0.6.1-sar-tickless.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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -38,21 +39,19 @@ activity.
%patch4 -p1 -b .sec %patch4 -p1 -b .sec
%patch5 -p1 -b .isag %patch5 -p1 -b .isag
%patch6 -p1 -b .tl2 %patch6 -p1 -b .tl2
%patch7 -p1 -b .dmg
iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
mv CREDITS.aux CREDITS mv CREDITS.aux CREDITS
%build %build
# FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and autoreconf -fi
# send the upstream maintainer a patch. ./configure --prefix=%{_prefix} --disable-man-group --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa --libdir=%{_libdir}
# add DOCDIR to the configure part
./configure --disable-man-group --prefix=%{_prefix} --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa --libdir=%{_libdir}
CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\"" CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
make CFLAGS="$CFLAGS" LFLAGS="" DOC_DIR=%{_docdir}/%{name}-%{version} make CFLAGS="$CFLAGS" LFLAGS=""
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install
make install IGNORE_MAN_GROUP=y DOC_DIR=%{_docdir}/%{name}-%{version} INIT_DIR=%{_initrddir}
mkdir -p %{buildroot}/%{_sysconfdir}/cron.d mkdir -p %{buildroot}/%{_sysconfdir}/cron.d
install -m 0644 sysstat.crond %{buildroot}/%{_sysconfdir}/cron.d/sysstat install -m 0644 sysstat.crond %{buildroot}/%{_sysconfdir}/cron.d/sysstat
@ -89,6 +88,11 @@ rm -rf %{buildroot}
%{_localstatedir}/log/sa %{_localstatedir}/log/sa
%changelog %changelog
* Tue Sep 21 2010 Ivana Hutarova Varekova <varekova@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@redhat.com> - 9.0.6.1-6 * Wed Sep 8 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 9.0.6.1-6
- fix the sar output on tickless kernel - fix the sar output on tickless kernel