Accepting request 574272 from home:hreinecke:branches:Base:System

- Merge local patch with git repository
  * Delete sgut-libversioning.diff

OBS-URL: https://build.opensuse.org/request/show/574272
OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=73
This commit is contained in:
Dirk Mueller 2018-02-09 08:26:13 +00:00 committed by Git OBS Bridge
parent e15e64f190
commit cfb2b1b8eb
4 changed files with 8 additions and 27 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:418782f487a2062290277380b6950b0f0c2652699fda5bdc1a4348f28f709d7d
size 856416
oid sha256:374edb0e948cc6bca420ba7a4b381e49aa7e127e921e2ea2713f295a511fdfa0
size 856488

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 8 15:37:33 CET 2018 - hare@suse.de
- Merge local patch with git repository
* Delete sgut-libversioning.diff
-------------------------------------------------------------------
Wed Feb 7 16:12:10 CET 2018 - hare@suse.de

View File

@ -26,7 +26,6 @@ Group: Hardware/Other
Url: http://sg.danny.cz/sg/sg3_utils.html
Source: sg3_utils-%{version}.tar.xz
Patch1: sgut-libversioning.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libtool
BuildRequires: udev
@ -85,7 +84,6 @@ applications that want to make use of libsgutils.
%prep
%setup -q
%patch1 -p1
%build
autoreconf -fi

View File

@ -1,23 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2015-02-13 15:29:13.225224047 +0100
build: use unique SONAME for libsgutils
sg3_utils has added functions between (for example) 1.36 and 1.39
without tracking them (either by using a different SONAME,
or using ELF symbol versions).
---
lib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -48,7 +48,7 @@ AM_CFLAGS = -Wall -W
lib_LTLIBRARIES = libsgutils2.la
-libsgutils2_la_LDFLAGS = -version-info 2:0:0 -no-undefined
+libsgutils2_la_LDFLAGS = -version-info 2:0:0 -no-undefined -release ${PACKAGE_VERSION}
libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@