From 8e8ba189c3d2609f5b48a2dbdd79f301d86dd32f Mon Sep 17 00:00:00 2001
From: Doug Ledford <dledford@fedoraproject.org>
Date: Dec 03 2009 20:04:19 +0000
Subject: - Update to latest upstream release

- Minor tweaks to init script for LSB compliance

---

diff --git a/opensm-3.2.1-elif.patch b/opensm-3.2.1-elif.patch
deleted file mode 100644
index 56656d0..0000000
--- a/opensm-3.2.1-elif.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opensm-3.3.1/include/vendor/osm_vendor.h.elif	2008-10-14 05:04:45.000000000 -0400
-+++ opensm-3.3.1/include/vendor/osm_vendor.h	2009-04-22 12:40:46.000000000 -0400
-@@ -65,7 +65,7 @@
- #include <vendor/osm_vendor_ibumad.h>
- #elif defined( OSM_VENDOR_INTF_AL )
- #include <vendor/osm_vendor_al.h>
--#elif
-+#else
- #error No MAD Interface selected!
- #error Choose an interface in osm_config.h
- #endif
diff --git a/opensm.initd b/opensm.initd
index 9a1f45d..59d8c4d 100644
--- a/opensm.initd
+++ b/opensm.initd
@@ -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=$? ;;
diff --git a/opensm.spec b/opensm.spec
index 2f51993..f518866 100644
--- a/opensm.spec
+++ b/opensm.spec
@@ -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/downloads/management/%{name}-%{version}.tar.
 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@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@lists.fedoraproject.org> - 3.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index a4080fb..6a298d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8925a54defa3e87573a6d127b8790f7f  opensm-3.3.2.tar.gz
+0a50e041932b4abf240c8d4a519e59a4  opensm-3.3.3.tar.gz