remove 5.4; add OCUM files to 5.6

gcoxmoz · Nov 18, 2016 · dc141be · dc141be
1 parent 04f042c
commit dc141be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 68 deletions.
diff --git a/SDK/NetApp/NetApp-SDK-5.4P2-perlfix.patch b/SDK/NetApp/NetApp-SDK-5.4P2-perlfix.patch
diff --git a/SDK/NetApp/NetApp-SDK-5.4P2.spec b/SDK/NetApp/NetApp-SDK-5.4P2.spec
diff --git a/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch b/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch
@@ -12,3 +12,14 @@
  	my $hex_length;
 
  	## Perl socket timeout has no effect during socket read.
+--- lib/perl/NetApp/OCUMAPI-old.pm	2016-09-27 17:06:10.000000000 +0000
++++ lib/perl/NetApp/OCUMAPI.pm	2016-11-18 19:05:55.794856254 +0000
+@@ -5375,7 +5375,7 @@
+
+ sub IsArrayFlag {
+     my ($self, $flag) = @_;
+-    return ($flag & FIELD_ARRAY) == FIELD_ARRAY;
++    return $flag ? (($flag & FIELD_ARRAY) == FIELD_ARRAY) : 0;
+ }
+
+ sub IsEncryptedFlag {
diff --git a/SDK/NetApp/NetApp-SDK-5.6.spec b/SDK/NetApp/NetApp-SDK-5.6.spec
@@ -5,7 +5,7 @@
 Summary:   NetApp's SDK for interacting with filers
 Name:      NetApp-SDK
 Version:   5.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   NetApp SDK License Agreement v11-04-14
 Group:     Development/Libraries
 Source:    http://mysupport.netapp.com/NOW/download/software/nmsdk/%{version}/netapp-manageability-sdk-%{version}.zip
@@ -36,6 +36,9 @@ The NetApp Manageability SDK provides resources to develop applications that mon
 %{__mkdir} -p $RPM_BUILD_ROOT%{perl_vendorlib}/%{name}
 %{__cp} lib/perl/NetApp/NaServer.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name}
 %{__cp} lib/perl/NetApp/NaElement.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name}
+%{__cp} lib/perl/NetApp/OCUMAPI.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name}
+%{__cp} lib/perl/NetApp/OntapClusterAPI.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name}
+# You could add more files here, maybe even wildcard it.  But I like a tidy directory.
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT