From 79f04978af324a18c4b1e92e7e278ebc2e242a0b92f43d7cf33cd7688941e7f0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 24 Jun 2016 07:54:53 +0000 Subject: [PATCH] Accepting request 404310 from home:lee_duncan:branches:Base:System - Updated to version 0.96, replacing main tarball, and removing both patches: D open-isns-Update-GPL-license-information.patch D open-isns-Install-isns_config.5.patch OBS-URL: https://build.opensuse.org/request/show/404310 OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=7 --- open-isns-0.96.tar.gz | 3 + open-isns-Install-isns_config.5.patch | 33 ---- ...-isns-Update-GPL-license-information.patch | 148 ------------------ open-isns.changes | 8 + open-isns.spec | 12 +- v0.95.tar.gz | 3 - 6 files changed, 15 insertions(+), 192 deletions(-) create mode 100644 open-isns-0.96.tar.gz delete mode 100644 open-isns-Install-isns_config.5.patch delete mode 100644 open-isns-Update-GPL-license-information.patch delete mode 100644 v0.95.tar.gz diff --git a/open-isns-0.96.tar.gz b/open-isns-0.96.tar.gz new file mode 100644 index 0000000..2dd5a31 --- /dev/null +++ b/open-isns-0.96.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:487fd0d87826423ea99dc159826d0b654a5da016ed670d4395a77bfa4f62e2ec +size 276136 diff --git a/open-isns-Install-isns_config.5.patch b/open-isns-Install-isns_config.5.patch deleted file mode 100644 index b71477e..0000000 --- a/open-isns-Install-isns_config.5.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c239f2776d1991cb13b54976b5eaeeabfefc88f8 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Tue, 8 Dec 2015 18:52:05 -0800 -Subject: [PATCH] Install isns_config.5 - ---- - Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 91f55c2832e4..080ae1d8edcd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -90,7 +90,7 @@ all: $(LIB) isnsd isnsadm isnsdd $(TESTS) - - install: - @echo "*** Installing Open-iSNS ***" -- $(INSTALL) -m 755 -d $(CFGDIR) $(MANDIR)/man8 $(SBINDIR) $(SYSTEMDDIR) -+ $(INSTALL) -m 755 -d $(CFGDIR) $(MANDIR)/man8 $(MANDIR)/man5 $(SBINDIR) $(SYSTEMDDIR) - $(INSTALL) -m 700 -d $(VARDIR) - $(INSTALL) -m 555 isnsd isnsadm isnsdd $(SBINDIR) - $(INSTALL) -m 644 etc/isnsd.conf $(CFGDIR) -@@ -99,6 +99,7 @@ install: - $(INSTALL) -m 644 doc/isnsd.8 $(MANDIR)/man8 - $(INSTALL) -m 644 doc/isnsdd.8 $(MANDIR)/man8 - $(INSTALL) -m 644 doc/isnsadm.8 $(MANDIR)/man8 -+ $(INSTALL) -m 644 doc/isns_config.5 $(MANDIR)/man5 - $(INSTALL) -m 644 isnsd.service $(SYSTEMDDIR) - $(INSTALL) -m 644 isnsd.socket $(SYSTEMDDIR) - --- -2.1.4 - diff --git a/open-isns-Update-GPL-license-information.patch b/open-isns-Update-GPL-license-information.patch deleted file mode 100644 index 6ed3d6a..0000000 --- a/open-isns-Update-GPL-license-information.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 88c80003b97f67e4b180d6c6a64219110017d1a4 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Thu, 17 Dec 2015 09:05:39 -0800 -Subject: [PATCH] Update GPL license information. - -Installed latest LGPL-2.1 license file (COPYING), and updated -README file with updated GNU mailing address. ---- - COPYING | 62 ++++++++------------------------------------------------------ - README | 9 ++++++--- - 2 files changed, 14 insertions(+), 57 deletions(-) - -diff --git a/COPYING b/COPYING -index b1e3f5a26387..e9ab0b39d528 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,8 +1,8 @@ -- GNU LESSER GENERAL PUBLIC LICENSE -- Version 2.1, February 1999 -+ GNU LESSER GENERAL PUBLIC LICENSE -+ Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -10,7 +10,7 @@ - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a - former contains code derived from the library, whereas the latter must - be combined with the library in order to run. - -- GNU LESSER GENERAL PUBLIC LICENSE -+ GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based - on the Library (independent of the use of the Library in a tool for - writing it). Whether that is true depends on what the Library does - and what the program that uses the Library does. -- -+ - 1. You may copy and distribute verbatim copies of the Library's - complete source code as you receive it, in any medium, provided that - you conspicuously and appropriately publish on each copy an -@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -@@ -455,50 +455,4 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- How to Apply These Terms to Your New Libraries -- -- If you develop a new library, and you want it to be of the greatest --possible use to the public, we recommend making it free software that --everyone can redistribute and change. You can do so by permitting --redistribution under these terms (or, alternatively, under the terms of the --ordinary General Public License). -- -- To apply these terms, attach the following notices to the library. It is --safest to attach them to the start of each source file to most effectively --convey the exclusion of warranty; and each file should have at least the --"copyright" line and a pointer to where the full notice is found. -- -- -- Copyright (C) -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --Also add information on how to contact you by electronic and paper mail. -- --You should also get your employer (if you work as a programmer) or your --school, if any, to sign a "copyright disclaimer" for the library, if --necessary. Here is a sample; alter the names: -- -- Yoyodyne, Inc., hereby disclaims all copyright interest in the -- library `Frob' (a library for tweaking knobs) written by James Random Hacker. -- -- , 1 April 1990 -- Ty Coon, President of Vice -- --That's all there is to it! -- -- -+ END OF TERMS AND CONDITIONS -diff --git a/README b/README -index a21d81581671..e4074f215ff5 100644 ---- a/README -+++ b/README -@@ -145,7 +145,7 @@ Downloading Open-iSNS - - Open-iSNS is available for download from: - -- https://github.com/gonzoleeman/open-isns/archive/0.93.tar.gz -+ https://github.com/gonzoleeman/open-isns/archive/$(VERSION).tar.gz - - or, in souce form, from: - -@@ -173,10 +173,13 @@ as RPMs are not available yet. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. - - ------------------------------------------------------------------ - --Current maintainer: -+Author: -+ Olaf Kirch - -+Current maintainer: - Lee Duncan 2015 --- -2.1.4 - diff --git a/open-isns.changes b/open-isns.changes index 9351a09..78010c7 100644 --- a/open-isns.changes +++ b/open-isns.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 23 17:24:07 UTC 2016 - lduncan@suse.com + +- Updated to version 0.96, replacing main tarball, and + removing both patches: + D open-isns-Update-GPL-license-information.patch + D open-isns-Install-isns_config.5.patch + ------------------------------------------------------------------- Fri Dec 18 19:50:02 UTC 2015 - lduncan@suse.com diff --git a/open-isns.spec b/open-isns.spec index d4ee974..4f53921 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -1,7 +1,7 @@ # # spec file for package open-isns # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,11 @@ Name: open-isns Summary: Partial Implementation of iSNS iSCSI registration License: LGPL-2.1+ Group: System Environment/Kernel -Version: 0.95 +Version: 0.96 Release: 0 -Source: https://github.com/gonzoleeman/%{name}/archive/v%{version}.tar.gz -Url: https://github.com/gonzoleeman/%{name} +Source: %{name}-%{version}.tar.gz +Url: https://github.com/open-iscsi/%{name} Source1: %{name}-firewall.service -Patch1: %{name}-Install-isns_config.5.patch -Patch2: %{name}-Update-GPL-license-information.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -58,8 +56,6 @@ Files to develop an application using the open-isns library. %prep %setup -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 %build autoconf diff --git a/v0.95.tar.gz b/v0.95.tar.gz deleted file mode 100644 index 396ddf0..0000000 --- a/v0.95.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3508e89ffd745e0b2901ec52c491fa2fddee7a83adff575a8ecb712da80cdb2a -size 270334