From 7558edb2f4247d2b902cde72a8606e3e91db0d89f0f5d962db6a74eb53d821a0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 23 Jul 2014 20:06:22 +0000 Subject: [PATCH] Accepting request 239894 from OFED:Factory Update to version in SLE12 OBS-URL: https://build.opensuse.org/request/show/239894 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/infinipath-psm?expand=0&rev=1 --- .gitattributes | 23 +++++ .gitignore | 1 + infinipath-psm-3.2-2_ga8c3e3e_open.tar.gz | 3 + infinipath-psm-cflags.patch | 21 +++++ infinipath-psm-executable_headers.patch | 27 ++++++ infinipath-psm-no_werror.patch | 17 ++++ infinipath-psm.changes | 84 ++++++++++++++++++ infinipath-psm.spec | 100 ++++++++++++++++++++++ 8 files changed, 276 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 infinipath-psm-3.2-2_ga8c3e3e_open.tar.gz create mode 100644 infinipath-psm-cflags.patch create mode 100644 infinipath-psm-executable_headers.patch create mode 100644 infinipath-psm-no_werror.patch create mode 100644 infinipath-psm.changes create mode 100644 infinipath-psm.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/infinipath-psm-3.2-2_ga8c3e3e_open.tar.gz b/infinipath-psm-3.2-2_ga8c3e3e_open.tar.gz new file mode 100644 index 0000000..5afead7 --- /dev/null +++ b/infinipath-psm-3.2-2_ga8c3e3e_open.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f96e1412ec62c775663396f81232140b12d4f5f9539bbf86d6763f0f3de429 +size 363401 diff --git a/infinipath-psm-cflags.patch b/infinipath-psm-cflags.patch new file mode 100644 index 0000000..f41fe84 --- /dev/null +++ b/infinipath-psm-cflags.patch @@ -0,0 +1,21 @@ +--- + buildflags.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: buildflags.mak +=================================================================== +--- buildflags.mak.orig 2014-01-08 22:33:34.000000000 +0100 ++++ buildflags.mak 2014-01-17 14:58:34.775548741 +0100 +@@ -108,10 +108,10 @@ else + endif + else + ifeq (${CCARCH},gcc) +- CFLAGS += $(BASECFLAGS) -Wno-strict-aliasing ++ CFLAGS += $(BASECFLAGS) $(RPM_OPT_FLAGS) + else + ifeq (${CCARCH},gcc4) +- CFLAGS += $(BASECFLAGS) ++ CFLAGS += $(BASECFLAGS) $(RPM_OPT_FLAGS) + else + $(error Unknown compiler arch "${CCARCH}") + endif # gcc4 diff --git a/infinipath-psm-executable_headers.patch b/infinipath-psm-executable_headers.patch new file mode 100644 index 0000000..8cde504 --- /dev/null +++ b/infinipath-psm-executable_headers.patch @@ -0,0 +1,27 @@ +From: Philipp Thomas +Date: 2012-09-13 16:20:09 +02:00 +Subject: Strip executable mode from headers +Upstream: submitted + +Install headers as normal files. + + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: Makefile +=================================================================== +--- Makefile.orig 2014-01-17 14:54:38.418004126 +0100 ++++ Makefile 2014-01-17 14:55:35.516686291 +0100 +@@ -149,8 +149,8 @@ install: all + (cd ${DESTDIR}${INSTALL_LIB_TARG} ; \ + ln -sf ${TARGLIB}.so.${MAJOR}.${MINOR} ${TARGLIB}.so.${MAJOR} ; \ + ln -sf ${TARGLIB}.so.${MAJOR} ${TARGLIB}.so) +- install -D psm.h ${DESTDIR}/usr/include/psm.h +- install -D psm_mq.h ${DESTDIR}/usr/include/psm_mq.h ++ install -D -m 644 psm.h ${DESTDIR}/usr/include/psm.h ++ install -D -m 644 psm_mq.h ${DESTDIR}/usr/include/psm_mq.h + + specfile: + sed \ diff --git a/infinipath-psm-no_werror.patch b/infinipath-psm-no_werror.patch new file mode 100644 index 0000000..46c8fd7 --- /dev/null +++ b/infinipath-psm-no_werror.patch @@ -0,0 +1,17 @@ +--- + buildflags.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: buildflags.mak +=================================================================== +--- buildflags.mak.orig 2014-01-17 14:58:19.301905910 +0100 ++++ buildflags.mak 2014-01-17 14:58:19.318905518 +0100 +@@ -71,7 +71,7 @@ ASFLAGS += $(BASE_FLAGS) + + WERROR := -Werror + INCLUDES := -I. -I$(top_srcdir)/include -I$(top_srcdir)/mpspawn -I$(top_srcdir)/include/$(os)-$(arch) +-BASECFLAGS +=-Wall $(WERROR) ++BASECFLAGS +=-Wall -Wno-attributes + ifneq (,${PSM_DEBUG}) + BASECFLAGS += -O0 -g3 -DPSM_DEBUG -funit-at-a-time -Wp,-D_FORTIFY_SOURCE=2 + else diff --git a/infinipath-psm.changes b/infinipath-psm.changes new file mode 100644 index 0000000..591c358 --- /dev/null +++ b/infinipath-psm.changes @@ -0,0 +1,84 @@ +------------------------------------------------------------------- +Tue Jul 8 15:00:35 CEST 2014 - pth@suse.de + +- Add COPYING to documentation. + +------------------------------------------------------------------- +Fri Jun 6 13:36:47 CEST 2014 - pth@suse.de + +- Document that the shared library package was renamed so the package + needs obsoletes/provides. + +------------------------------------------------------------------- +Tue Jun 3 11:24:34 CEST 2014 - pth@suse.de + +- Update to OFED 3.12 final. + +------------------------------------------------------------------- +Tue Mar 18 11:07:05 CET 2014 - pth@suse.de + +- Fix ExclusiveArch. + +------------------------------------------------------------------- +Wed Mar 5 13:25:54 CET 2014 - pth@suse.de + +- Add an ExclusiveArch as the package is only supported on + i686 and x86_64. + +------------------------------------------------------------------- +Fri Jan 24 16:40:36 CET 2014 - pth@suse.de + +- Fix Copyright in spec file. + +------------------------------------------------------------------- +Fri Jan 17 14:53:25 CET 2014 - pth@suse.de + +- Update to 3.2 from OFED 3.12 +- Remove infinipath-psm-identical_field_names.patch which doesn't + apply anymore. +- Remove infinipath-psm-add_symbol_to_ignore.patch as the fix is + upstream. + +------------------------------------------------------------------- +Fri Jul 12 11:33:48 CEST 2013 - pth@suse.de + +- Update to latest version 3.1. +- Adapt infinipath-psm-add_symbol_to_ignore.patch to new sources. +- Add source URL. + +------------------------------------------------------------------- +Tue Jul 9 15:22:05 CEST 2013 - pth@suse.de + +- Fix spec by running service format_spec_file. + +------------------------------------------------------------------- +Tue Jun 25 13:38:01 CEST 2013 - pth@suse.de + +- Fix makefile so that the presence of _edata does not lead to a + failed build: infinipath-psm-add_symbol_to_ignore.patch + +------------------------------------------------------------------- +Tue Oct 9 12:34:15 CEST 2012 - pth@suse.de + +- Fix paths to libraries in %%files section. + +------------------------------------------------------------------- +Thu Sep 13 16:32:01 CEST 2012 - pth@suse.de + +- Update to latest version 3.0.1. +- Use RPM_OPT_FLAGS to define compiler options + (infinipath-psm-cflags.patch). +- Don't use -Werror as newer gccs warn of possible ono-inlining. + (infinipath-psm-no_werror.patch). +- Rename the member of a bitfield as newer gcc stops with error + (infinipath-psm-identical_field_names.patch). +- Don't install headers with executable flag set + (infinipath-psm-executable_headers.patch). + +------------------------------------------------------------------- +Tue Sep 11 19:11:48 CEST 2012 - pth@suse.de + +- Initial package based on the version in OFED 1.5.4.1 +- Implement shared library policy. + + diff --git a/infinipath-psm.spec b/infinipath-psm.spec new file mode 100644 index 0000000..602a125 --- /dev/null +++ b/infinipath-psm.spec @@ -0,0 +1,100 @@ +# +# spec file for package infinipath-psm +# +# Copyright (c) 2011-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define my_release 2_ga8c3e3e_open + +Name: infinipath-psm +Version: 3.2 +Release: 0 +Summary: QLogic PSM Libraries +License: BSD-2-Clause or GPL-2.0 +Group: Productivity/Networking/System +Url: http://www.qlogic.com/ +Source0: %{name}-%{version}-%{my_release}.tar.gz +# PATCH-FIX-UPSTREAM infinipath-psm-cflags.patch pth@suse.de +Patch0: infinipath-psm-cflags.patch +# PATCH-FIX-UPSTREAM infinipath-psm-no_werror.patch pth@suse.de +Patch1: infinipath-psm-no_werror.patch +# PATCH-FIX-UPSTREAM infinipath-psm-executable_headers.patch pth@suse.de +Patch3: infinipath-psm-executable_headers.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: infinipath-libs +ExclusiveArch: %ix86 x86_64 + +%define so_major 1 +%define lname libpsm_infinipath%{so_major} + +%description +The PSM Messaging API, or PSM API, is QLogic's low-level +user-level communications interface for the Truescale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%package devel +Summary: Development files for QLogic PSM +Group: Development/Libraries/C and C++ +Requires: %{lname} = %{version} +Conflicts: infinipath-devel + +%description devel +Development files for the libpsm_infinipath library + +%package -n %{lname} +Summary: Development files for QLogic PSM +Group: System/Libraries +Obsoletes: infinipath-psm < %{version} +Provides: infinipath-psm = %{version} + +%description -n %{lname} +The PSM Messaging API, or PSM API, is QLogic's low-level +user-level communications interface for the Truescale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%prep +%setup -q -n infinipath-psm-%{version}-%{my_release} +%patch0 +%patch1 +%patch3 + +%build +export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable" +make USE_PSM_UUID=1 %{?_smp_mflags} + +%install +%makeinstall + +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig + +%files -n %{lname} +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libpsm_infinipath.so.* +%{_libdir}/libinfinipath.so.* + +%files devel +%defattr(-,root,root,-) +%{_libdir}/libpsm_infinipath.so +%{_libdir}/libinfinipath.so +%{_includedir}/psm.h +%{_includedir}/psm_mq.h + +%changelog