rpms/salinfo/devel salinfo.spec,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: prarit

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13706

Modified Files:
	salinfo.spec 
Log Message:
New salinfo.spec file compatible w/ 2.6.18 kernel



Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- salinfo.spec	12 Jul 2006 08:05:56 -0000	1.14
+++ salinfo.spec	11 Oct 2006 15:43:46 -0000	1.15
@@ -1,91 +1,65 @@
-Summary:        SAL info tool.
-Name:           salinfo
-Version:        0.5
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
-Epoch:		1
-Group:          System Environment/Base
-License:        GPL
-Source0:	salinfo-0.5-rhel4.tar.gz
-Buildroot:      %{_tmppath}/%{name}-%{version}-root
-Prereq:		/sbin/chkconfig /sbin/service
-Requires:	fileutils kudzu
-BuildPreReq: 	readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext
-ExclusiveArch:	ia64
-Obsoletes:	kernel-utils
+Summary: Sal info tool.
+Name: salinfo
+Version: 1.1
+Release: 2
+License: GPL
+Group: Utilities/System
+Source: salinfo-%{version}.tar.gz
+Source1:  salinfo_decode-init
+Source2:  salinfo_decode-sysconfig
+ExclusiveOS: Linux
+ExclusiveArch: ia64
+BuildRoot: /var/tmp/salinfo-root
+PreReq: /sbin/chkconfig /etc/init.d
 
 %description
-salinfod. FIXME.
+The IA64 Linux kernel has a Software Abstraction Layer (SAL).  One of
+SAL's tasks is to record machine problems such as CMC (correctable
+machine checks), CPE (correctable platform errors), MCA (machine check
+architecture) and INIT (cpu initialized after boot).  These records are
+provided by SAL to user space.  salinfo saves and decodes CMC/CPE/MCA
+and INIT records.
 
 %prep
-%setup -q -c -a 0
+%setup
 
 %build
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p %{buildroot}/usr/sbin
-mkdir -p %{buildroot}/usr/man
-mkdir -p %{buildroot}/etc/rc.d/init.d
-mkdir -p %{buildroot}/etc/sysconfig
-
-cd salinfo-0.5-rhel4
-make CFLAGS="$RPM_OPT_FLAGS"
-
+make
 
 %install
-mkdir -p %{buildroot}/usr/share/man/man{1,8}
+rm -rf %{buildroot}
+make install prefix=%{buildroot}
 
-cd salinfo-0.5-rhel4
-make install prefix=%{buildroot} mandir=%{_mandir} sbindir=%{_sbindir} initdir=%{_sysconfdir}/rc.d/init.d logdir=/var/log/salinfo
-
-chmod -R a-s %{buildroot}
+# We have our own versions of these that fit better with the OS
+rm -f %{buildroot}/etc/rc.d/init.d/salinfo_decode_all
+rm -f %{buildroot}/etc/sysconfig/salinfo_decode_all
+
+# Our versions 
+install -m 755 %{S:1} %{buildroot}/etc/rc.d/init.d/salinfo_decode
+install -m 644 %{S:2} %{buildroot}/etc/sysconfig/salinfo_decode
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc %{_mandir}/man8/salinfo_decode.8.gz
-%{_sbindir}/salinfod
-%{_sbindir}/salinfo_decode2
-%{_sbindir}/salinfo_decode
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/salinfod
-%dir /var/log/salinfo
-%dir /var/log/salinfo/raw
-%dir /var/log/salinfo/decoded
-
-%preun
-if [ "$1" = "0" ] ; then
- /sbin/service salinfod stop
- /sbin/chkconfig --del salinfod
-fi
+%attr(700,root,root) %dir	/var/log/salinfo/raw
+%attr(700,root,root) %dir	/var/log/salinfo/decoded
+%attr(755,root,root)		%{_sbindir}/salinfo_decode
+%attr(755,root,root)		%{_sbindir}/salinfo_decode_all
+%attr(644,root,root) %config	%{_sysconfdir}/logrotate.d/salinfo_decode
+%attr(755,root,root)		%{_sysconfdir}/rc.d/init.d/salinfo_decode
+%attr(644,root,root) %config	%{_sysconfdir}/sysconfig/salinfo_decode
+%attr(644,root,root)		%{_mandir}/man8/salinfo_decode.8*
 
 %post
-/sbin/chkconfig --add salinfod
-
-%triggerpostun -- kernel-utils
-/sbin/chkconfig --add salinfod
-exit 0
+umask 022
 
+# systems should have this enabled by default
+chkconfig --add salinfo_decode
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5-1.13.1
-- rebuild
-
-* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
-- rebuild.
-
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Mar  1 2005 Dave Jones <davej at redhat.com>
-- Rebuild for gcc4
-
-* Wed Feb  9 2005 Dave Jones <davej at redhat.com>
-- Rebuild with $RPM_OPT_FLAGS
-
-* Sat Dec 18 2004 Dave Jones <davej at redhat.com>
-- Initial packaging, based upon kernel-utils.
-
+* Tue Sep 19 2006 Prarit Bhargava <prarit at redhat.com> 1.1-2
+- spec file updates to conform to RH standard
+* Wed Aug 30 2006 Erik Jacobsen <erikj at sgi.com> 1.1-1
+- original specfile and package.