From cfb2b1b8eb3068a1e8cb0adf627b2a8f90fa72e0a7599e7a3298ee2d4f0be86c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 9 Feb 2018 08:26:13 +0000 Subject: [PATCH] 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 --- sg3_utils-1.43.tar.xz | 4 ++-- sg3_utils.changes | 6 ++++++ sg3_utils.spec | 2 -- sgut-libversioning.diff | 23 ----------------------- 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 sgut-libversioning.diff diff --git a/sg3_utils-1.43.tar.xz b/sg3_utils-1.43.tar.xz index 22781d4..ca4674f 100644 --- a/sg3_utils-1.43.tar.xz +++ b/sg3_utils-1.43.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:418782f487a2062290277380b6950b0f0c2652699fda5bdc1a4348f28f709d7d -size 856416 +oid sha256:374edb0e948cc6bca420ba7a4b381e49aa7e127e921e2ea2713f295a511fdfa0 +size 856488 diff --git a/sg3_utils.changes b/sg3_utils.changes index 39c21ee..afe256e 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -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 diff --git a/sg3_utils.spec b/sg3_utils.spec index 3baaf94..4589712 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -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 diff --git a/sgut-libversioning.diff b/sgut-libversioning.diff deleted file mode 100644 index 2746705..0000000 --- a/sgut-libversioning.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -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@