rpms/opensm/devel .cvsignore, 1.4, 1.5 opensm.initd, 1.3, 1.4 opensm.spec, 1.7, 1.8 sources, 1.4, 1.5 opensm-3.2.1-elif.patch, 1.2, NONE

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/opensm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27215

Modified Files:
	.cvsignore opensm.initd opensm.spec sources 
Removed Files:
	opensm-3.2.1-elif.patch 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
- Update to latest upstream release
- Minor tweaks to init script for LSB compliance



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 20:06:57 -0000	1.4
+++ .cvsignore	3 Dec 2009 20:02:52 -0000	1.5
@@ -1,3 +1,4 @@
 opensm-3.2.1.tar.gz
 opensm-3.3.1.tar.gz
 opensm-3.3.2.tar.gz
+opensm-3.3.3.tar.gz


Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opensm.initd	22 Apr 2009 14:24:05 -0000	1.3
+++ opensm.initd	3 Dec 2009 20:02:53 -0000	1.4
@@ -117,6 +117,11 @@ usage ()
 }
 
 case $ACTION in
+	start|stop|restart|reload|condrestart|try-restart|force-reload)
+	    [ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $ACTION in
 	start) start; RC=$? ;;
 	stop) stop; RC=$? ;;
 	restart) restart; RC=$? ;;


Index: opensm.spec
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- opensm.spec	25 Jul 2009 20:53:03 -0000	1.7
+++ opensm.spec	3 Dec 2009 20:02:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name: opensm
-Version: 3.3.2
-Release: 2%{?dist}
+Version: 3.3.3
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
 License: GPLv2 or BSD
@@ -9,9 +9,8 @@ Source0: http://www.openfabrics.org/down
 Source1: opensm.conf
 Source2: opensm.logrotate
 Source3: opensm.initd
-Patch1:  opensm-3.2.1-elif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel = 1.3.2, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel = 1.3.3, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 
 %description
@@ -46,7 +45,6 @@ Static version of opensm libraries
 
 %prep
 %setup -q
-%patch1 -p1 -b .elif
 
 %build
 %configure --with-opensm-conf-sub-dir=rdma
@@ -60,7 +58,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm
-install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm
+install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initddir}/opensm
 mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm
 
 %clean
@@ -88,7 +86,7 @@ fi
 %defattr(-,root,root,-)
 %dir /var/cache/opensm
 %{_sbindir}/*
-%{_initrddir}/opensm
+%{_initddir}/opensm
 %{_mandir}/man8/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/opensm
 %config(noreplace) %{_sysconfdir}/rdma/opensm.conf
@@ -108,6 +106,10 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
+- Update to latest upstream release
+- Minor tweaks to init script for LSB compliance
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 20:06:57 -0000	1.4
+++ sources	3 Dec 2009 20:02:53 -0000	1.5
@@ -1 +1 @@
-8925a54defa3e87573a6d127b8790f7f  opensm-3.3.2.tar.gz
+0a50e041932b4abf240c8d4a519e59a4  opensm-3.3.3.tar.gz


--- opensm-3.2.1-elif.patch DELETED ---