Hello community, here is the log from the commit of package opa-fm for openSUSE:Factory checked in at 2017-08-29 11:45:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-fm (Old) and /work/SRC/openSUSE:Factory/.opa-fm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-fm" Tue Aug 29 11:45:10 2017 rev:5 rq:519122 version:10.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-fm/opa-fm.changes 2017-08-13 14:57:53.051785975 +0200 +++ /work/SRC/openSUSE:Factory/.opa-fm.new/opa-fm.changes 2017-08-29 11:46:09.414762809 +0200 @@ -1,0 +2,10 @@ +Mon Aug 28 12:08:54 UTC 2017 - nmoreychaisemar...@suse.com + +- Update patches to latest sources: + * opa-fm-use-RPM_OPT_FLAGS.patch + * 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch was renamed + to opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch +- Add opa-fm-sigset-was-removed.patch to build with the latest glibc + which does not expose <bits/sigset.h> anymore + +------------------------------------------------------------------- Old: ---- 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch New: ---- opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch opa-fm-sigset-was-removed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-fm.spec ++++++ --- /var/tmp/diff_new_pack.3wqo7F/_old 2017-08-29 11:46:11.110523777 +0200 +++ /var/tmp/diff_new_pack.3wqo7F/_new 2017-08-29 11:46:11.122522085 +0200 @@ -28,8 +28,9 @@ Url: http://www.intel.com/ Source: opa-fm-%{version}.tar.gz Source1: %{name}-rpmlintrc -Patch1: 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch +Patch1: opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch Patch2: opa-fm-use-RPM_OPT_FLAGS.patch +Patch3: opa-fm-sigset-was-removed.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libexpat-devel @@ -51,8 +52,9 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 +%patch1 +%patch2 +%patch3 %build export RPM_OPT_FLAGS ++++++ opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch ++++++ diff --git MakeTools/funcs-ext.sh MakeTools/funcs-ext.sh index afeeba9..62c96fe 100755 --- MakeTools/funcs-ext.sh +++ MakeTools/funcs-ext.sh @@ -711,27 +711,32 @@ function os_vendor() rval=apple else filelist=`'ls' /etc/*-release | egrep -v lsb | egrep -v os` - rval="" - for file in $filelist - do - if [ -f $file ] - then - rval=`basename $file -release` - if [ $rval = 'SuSE' ] - then - if [ -f /etc/UnitedLinux-release ] - then - rval=UnitedLinux - fi - elif [ $rval = 'centos' ] - then - rval=redhat - elif [ $rval != 'os' ] - then - break - fi - fi - done + if [ $? == 1 ] + then + rval="custom" + else + rval="" + for file in $filelist + do + if [ -f $file ] + then + rval=`basename $file -release` + if [ $rval = 'SuSE' ] + then + if [ -f /etc/UnitedLinux-release ] + then + rval=UnitedLinux + fi + elif [ $rval = 'centos' ] + then + rval=redhat + elif [ $rval != 'os' ] + then + break + fi + fi + done + fi fi echo $rval } ++++++ opa-fm-sigset-was-removed.patch ++++++ diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c index 82f30ca..e9281f4 100755 --- Esm/ib/src/ibaccess/vs_thr.c +++ Esm/ib/src/ibaccess/vs_thr.c @@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SFW 03/10/02 Initial functions all passing testcases. * MGR 04/19/02 Changed pthread_kill call to pthread_cancel. ***********************************************************************/ -//#if defined(LINT) +#if defined(LINT) #include <pthread.h> #define __signed__ signed #include <bits/sigset.h> -//#endif +#endif #include <stdio.h> #include <sys/types.h> #include <unistd.h> ++++++ opa-fm-use-RPM_OPT_FLAGS.patch ++++++ --- /var/tmp/diff_new_pack.3wqo7F/_old 2017-08-29 11:46:11.446476422 +0200 +++ /var/tmp/diff_new_pack.3wqo7F/_new 2017-08-29 11:46:11.450475858 +0200 @@ -1,8 +1,8 @@ -diff --git a/Esm/Makerules.project b/Esm/Makerules.project -index 4f33920..ffaf826 100755 ---- a/Esm/Makerules.project -+++ b/Esm/Makerules.project -@@ -124,6 +124,7 @@ BSCPROJ = +diff --git Esm/Makerules.project Esm/Makerules.project +index e4a8887..f3ca78e 100755 +--- Esm/Makerules.project ++++ Esm/Makerules.project +@@ -125,6 +125,7 @@ BSCPROJ = # strict-prototypes - treat extern int foo() as function with no args CPROJ = -DPRODUCT=$(PRODUCT) -DPRODUCT_$(PRODUCT) -DMODULEVERSION=$(MODULEVERSION) @@ -10,10 +10,10 @@ ifeq ($(IB_STACK),OPENIB) CPROJ += -DIB_STACK_OPENIB else -diff --git a/MakeTools/patch_version/Makefile b/MakeTools/patch_version/Makefile +diff --git MakeTools/patch_version/Makefile MakeTools/patch_version/Makefile index de6338c..2b7abde 100755 ---- a/MakeTools/patch_version/Makefile -+++ b/MakeTools/patch_version/Makefile +--- MakeTools/patch_version/Makefile ++++ MakeTools/patch_version/Makefile @@ -126,7 +126,7 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project # (Windows Only) #=============================================================================#
