- uhh, it was supposed to be -L (flock)

[packages/sysstat.git] / sysstat.spec

diff --git a/sysstat.spec b/sysstat.spec
index ce543d0fb6d857d12ba9ddef8faa041513c0d80e..f38d0b4bfa51cf4c6e26e50765878619d66b07e7 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -4,19 +4,19 @@ Summary(ru):  
 Summary(uk):   í¦ÓÔÉÔØ ËÏÍÁÎÄÉ ÓÉÓÔÅÍÎÏÇÏ ÍÏΦÔÏÒÉÎÇÕ sar ÔÁ iostat
 Summary(zh_CN):        sar, iostat µÈϵͳ¼àÊÓ¹¤¾ß
 Name:          sysstat
-Version:       4.1.6
-Release:       1
+Version:       5.0.5
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
-# Source0-md5: 8ffdb7abc6049f43c4f7b6a4fe06fe27
+# Source0-md5: 5fbe915c32761f28e7af27a7f956f7f2
 Source1:       %{name}.crond
 Source2:       %{name}.init
+Source3:       %{name}.sysconfig
 Patch0:                %{name}-opt.patch
-Patch1:                %{name}-verbose.patch
+Patch1:                %{name}-norwegian.patch
 URL:           http://perso.wanadoo.fr/sebastien.godard/
 BuildRequires: gettext-devel
-BuildRequires: sh-utils
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
 Requires:      crondaemon
@@ -44,14 +44,17 @@ sieciowych i innych operacji wej
 ÍÏΦÔÏÒÉÎÇ ÄÉÓËÏ×ϧ, ÍÅÒÅÖÅ×ϧ ÔÁ ¦ÎÛϧ ÁËÔÉ×ÎÏÓÔ¦ ÓÉÓÔÅÍÉ.
 
 %description -l zh_CN
-±¾Èí¼þÌṩÁËÓÃÓÚLinuxµÄϵͳ¼àÊÓ¹¤¾ß, ¿ÉÒÔ¼àÊÓ´ÅÅÌ, ÍøÂçÒÔ¼°
-ÆäËû IO µÄ»î¶¯Çé¿ö.
+±¾Èí¼þÌṩÁËÓÃÓÚLinuxµÄϵͳ¼àÊÓ¹¤¾ß, ¿ÉÒÔ¼àÊÓ´ÅÅÌ, ÍøÂçÒÔ¼° ÆäËû IO
+µÄ»î¶¯Çé¿ö.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
+mv -f nls/nb_NO nls/nb
+mv -f nls/nn_NO nls/nn
+
 %build
 echo "%{_prefix}
 /var/log/sa
@@ -69,12 +72,13 @@ n" | /bin/sh build/Configure.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d},/var/log/sa}
+install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d,sysconfig},/var/log/sa}
 
 %{__make} install
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/sysstat
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 %find_lang %{name}
 
@@ -82,13 +86,9 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" = "1" ]; then
-       /sbin/chkconfig --add sysstat
+/sbin/chkconfig --add sysstat
+if [ ! -f /var/lock/subsys/sysstat ]; then
        echo "Run \"/etc/rc.d/init.d/sysstat start\" to start sysstat." >&2
-else
-       if [ -f /var/lock/subsys/sysstat ]; then
-               /etc/rc.d/init.d/sysstat restart >&2
-       fi
 fi
 
 %preun
@@ -103,8 +103,9 @@ fi
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README *.sample TODO FAQ
 %attr(755,root,root) %{_bindir}/*
-%attr(750,root,root) %{_libdir}/sa*
+%attr(750,root,root) %{_prefix}/lib/sa*
 %attr(755,root,root) %dir /var/log/sa
 %attr(640,root,root) /etc/cron.d/sysstat
 %attr(754,root,root) /etc/rc.d/init.d/sysstat
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
 %{_mandir}/man*/*