From b46208d9c327a77fb934ba6103bcb3dbee4f3b3d0125c77cdd9fc87727974535 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 24 Feb 2012 11:06:14 +0000 Subject: [PATCH] Accepting request 105582 from OFED:Factory - No need to own %{_libdir}/mpi/gcc/, so package can be noarch - Mark stuff under /etc/profile.d as config and remove rpmlintrc (forwarded request 105359 from saschpe) OBS-URL: https://build.opensuse.org/request/show/105582 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpi-selector?expand=0&rev=12 --- mpi-selector-1.0.2.tar.bz2 | 3 --- mpi-selector-1.0.3.tar.bz2 | 3 +++ mpi-selector-no_bang_line.patch | 18 ++++++++++++++++++ mpi-selector.changes | 23 +++++++++++++++++++++++ mpi-selector.spec | 28 +++++++++++----------------- 5 files changed, 55 insertions(+), 20 deletions(-) delete mode 100644 mpi-selector-1.0.2.tar.bz2 create mode 100644 mpi-selector-1.0.3.tar.bz2 create mode 100644 mpi-selector-no_bang_line.patch diff --git a/mpi-selector-1.0.2.tar.bz2 b/mpi-selector-1.0.2.tar.bz2 deleted file mode 100644 index a1c8f97..0000000 --- a/mpi-selector-1.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f9927ad92d8b6d3beda8bf562b60ffcdd271ca11113e200f2fe8943bb85f8e3 -size 45574 diff --git a/mpi-selector-1.0.3.tar.bz2 b/mpi-selector-1.0.3.tar.bz2 new file mode 100644 index 0000000..4204640 --- /dev/null +++ b/mpi-selector-1.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f3670df2b6383a2084d9f9f31790d74a85f6fbb3b349428201a5f08dc80cf40 +size 45577 diff --git a/mpi-selector-no_bang_line.patch b/mpi-selector-no_bang_line.patch new file mode 100644 index 0000000..b32dc88 --- /dev/null +++ b/mpi-selector-no_bang_line.patch @@ -0,0 +1,18 @@ +Index: mpi-selector.csh.in +=================================================================== +--- mpi-selector.csh.in.orig 2009-08-02 09:58:22.000000000 +0200 ++++ mpi-selector.csh.in 2010-12-10 16:44:40.618387677 +0100 +@@ -1,4 +1,3 @@ +-#!/bin/csh + # Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + # + # File installed for Bourne-shell startups to select which MPI +Index: mpi-selector.sh.in +=================================================================== +--- mpi-selector.sh.in.orig 2009-08-02 09:58:22.000000000 +0200 ++++ mpi-selector.sh.in 2010-12-10 16:44:44.690098294 +0100 +@@ -1,4 +1,3 @@ +-#!/bin/sh + # Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + # + # File installed for Bourne-shell startups to select which MPI diff --git a/mpi-selector.changes b/mpi-selector.changes index 07da48e..87c81d9 100644 --- a/mpi-selector.changes +++ b/mpi-selector.changes @@ -1,9 +1,32 @@ +------------------------------------------------------------------- +Thu Feb 16 09:21:17 UTC 2012 - saschpe@suse.de + +- No need to own %{_libdir}/mpi/gcc/, so package can be noarch +- Mark stuff under /etc/profile.d as config and remove rpmlintrc + +------------------------------------------------------------------- +Mon Feb 13 10:50:42 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Fri Dec 10 16:48:40 CET 2010 - pth@suse.de + +- Fix use of perl_requires. +- Remove hash bang lines from files to be sourced. +- Add a rpmlintrc. + ------------------------------------------------------------------- Wed Jun 2 15:42:12 CEST 2010 - pth@suse.de - Explicitely use /usr/bin/perl not 'env perl', mainly so that rpm automatically detects the dependency. +------------------------------------------------------------------- +Thu Dec 3 08:35:07 CET 2009 - jjolly@suse.de + +- Update to v1.0.3 from OFED 1.4.2 + ------------------------------------------------------------------- Fri Oct 24 18:39:27 CEST 2008 - jjolly@suse.de diff --git a/mpi-selector.spec b/mpi-selector.spec index 242ce44..69a0349 100644 --- a/mpi-selector.spec +++ b/mpi-selector.spec @@ -1,7 +1,7 @@ # -# spec file for package mpi-selector (Version 1.0.2) +# spec file for package mpi-selector # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: mpi-selector Url: http://www.openfabrics.org Summary: Tool to provide defaults for which MPI implementation to use -Version: 1.0.2 -Release: 5 -License: BSD3c +Version: 1.0.3 +Release: 0 +License: BSD-3-Clause Group: System/Console Source: %{name}-%{version}.tar.bz2 Patch3: mpi-selector-perl_path.patch +Patch4: mpi-selector-no_bang_line.patch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{perl_requires} %description A simple tool that allows system administrators to set a site-wide @@ -38,22 +39,17 @@ the site-wide default. The default can be changed easily via the mpi-selector command -- editing of shell startup files is not required. - - %prep %setup -q %patch3 +%patch4 %build %configure --with-shell-startup-dir=/etc/profile.d make %install -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%_libdir/mpi/gcc - -%clean -rm -rf $RPM_BUILD_ROOT +%makeinstall %files %defattr(-, root, root, -) @@ -62,8 +58,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mpi-selector-menu %{_mandir}/man1/mpi-selector.* %{_mandir}/man1/mpi-selector-menu.* -%attr(644,root,root) /etc/profile.d/* -%dir %_libdir/mpi -%dir %_libdir/mpi/gcc +%config %attr(644,root,root) /etc/profile.d/* %changelog