SPECS: ism.spec - use service and macros

[glen]

Author: glen                         Date: Thu Sep 21 19:18:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use service and macros

---- Files affected:
SPECS:
   ism.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/ism.spec
diff -u SPECS/ism.spec:1.9 SPECS/ism.spec:1.10
--- SPECS/ism.spec:1.9	Sun Apr 16 23:53:53 2006
+++ SPECS/ism.spec	Thu Sep 21 21:18:36 2006
@@ -1,50 +1,52 @@
 # $Revision$, $Date$
 %define	iso_md5 25b6816378904eb61d0aee7aba2991fd
+%define	_ver	%(echo %{version} | tr -d .)
 Summary:	Intel Server Management
 Summary(pl):	Intel Server Management - oprogramowanie do zarządzania serwerem
 Name:		ism
 Version:	8.3.0
-Release:	0.1
+Release:	1
 License:	restricted, non-distributable
 Group:		Applications/System
 # downloading from http://downloadfinder.intel.com/scripts-df/Product_Filter.asp?ProductID=1071
-Source0:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)aa
+Source0:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}aa
 # NoSource0-md5:	52ea53ae2cf93247ca07c0cf257367b6
 NoSource:	0
-Source1:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ab
+Source1:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ab
 # NoSource1-md5:	9bca501dba89dd7720913124c3ade71a
 NoSource:	1
-Source2:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ac
+Source2:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ac
 # NoSource2-md5:	f1e8e2b09568f87e65d2371a5899c688
 NoSource:	2
-Source3:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ad
+Source3:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ad
 # NoSource3-md5:	76950c98eb18b0c1aaf00335088eaa12
 NoSource:	3
-Source4:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ae
+Source4:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ae
 # NoSource4-md5:	26e3e232228b19c0c73ad62ba76bcd9b
 NoSource:	4
-Source5:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)af
+Source5:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}af
 # NoSource5-md5:	654e183a32c59a4a47f9c457cfc5643d
 NoSource:	5
-Source6:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ag
+Source6:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ag
 # NoSource6-md5:	783e1dd01f73b23109e87e9970434b58
 NoSource:	6
-Source7:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ah
+Source7:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ah
 # NoSource7-md5:	55510bc5c5b3166dc14915e91ecd5ad8
 NoSource:	7
-Source8:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ai
+Source8:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ai
 # NoSource8-md5:	d18d195baec683b3aa565191907d6a20
 NoSource:	8
-Source9:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)aj
+Source9:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}aj
 # NoSource9-md5:	4233b377ea46a37f06d3fa7222cd2188
 NoSource:	9
-Source10:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo %{version} | tr -d .)ak
+Source10:	http://aiedownload.intel.com/df-support/8590/eng/%{name}%{_ver}ak
 # NoSource10-md5:	2d426246767550ee4eeae06fac1bd9f5
 NoSource:	10
 Source101:	%{name}-cli.init
 Source102:	dpcproxy.sysconfig
 BuildRequires:	cdrtools-utils
 BuildRequires:	mawk
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rpm-utils
 BuildRequires:	unzip
 ExclusiveArch:	%{ix86}
@@ -109,26 +111,17 @@
 
 %post cli
 /sbin/chkconfig --add dpcproxy
-if [ -f /var/lock/subsys/dpcproxy ]; then
-	/etc/rc.d/init.d/dpcproxy restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/dpcproxy start\" to start dpcproxy server" 1>&2
-fi
+%service dpcproxy restart
 
 %preun cli
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/dpcproxy ]; then
-		/etc/rc.d/init.d/dpcproxy stop >&2
-	fi
+	%service dpcproxy stop
 	/sbin/chkconfig --del dpcproxy
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%files
-#%defattr(644,root,root,755)
-
 %files cli
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dpcproxy
@@ -141,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/09/21 19:18:36  glen
+- use service and macros
+
 Revision 1.9  2006/04/16 21:53:53  glen
 - fix chkconfig, rc-scripts deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ism.spec?r1=1.9&r2=1.10&f=u