Hello community,

here is the log from the commit of package libcdio for openSUSE:Factory checked 
in at 2017-11-07 09:56:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcdio (Old)
 and      /work/SRC/openSUSE:Factory/.libcdio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libcdio"

Tue Nov  7 09:56:41 2017 rev:41 rq:539028 version:0.94

Changes:
--------
--- /work/SRC/openSUSE:Factory/libcdio/libcdio.changes  2017-10-10 
11:35:15.459825337 +0200
+++ /work/SRC/openSUSE:Factory/.libcdio.new/libcdio.changes     2017-11-07 
09:56:42.797100026 +0100
@@ -1,0 +2,7 @@
+Sat Nov  4 20:38:28 UTC 2017 - sch...@linux-m68k.org
+
+- 0001-Fix-symbol-versioning-for-exported-symbols.patch: Remove broken
+  patch
+- 0001-Savannah-Bug-49907.patch: Fix symbol versioning for real
+
+-------------------------------------------------------------------

Old:
----
  0001-Fix-symbol-versioning-for-exported-symbols.patch

New:
----
  0001-Savannah-Bug-49907.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libcdio.spec ++++++
--- /var/tmp/diff_new_pack.uCt3tx/_old  2017-11-07 09:56:43.721066486 +0100
+++ /var/tmp/diff_new_pack.uCt3tx/_new  2017-11-07 09:56:43.721066486 +0100
@@ -29,8 +29,8 @@
 Source1:        https://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.gz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
-# PATCH-FIX-OPENSUSE 0001-Fix-symbol-versioning-for-exported-symbols.patch 
https://savannah.gnu.org/bugs/index.php?49907
-Patch0:         0001-Fix-symbol-versioning-for-exported-symbols.patch
+# PATCH-FIX-UPSTREAM 0001-Savannah-Bug-49907.patch 
https://savannah.gnu.org/bugs/index.php?49907
+Patch0:         0001-Savannah-Bug-49907.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  help2man

++++++ 0001-Savannah-Bug-49907.patch ++++++
>From ddd984854b09c1a8203867534c087c0d83ff8622 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <ro...@gnu.org>
Date: Mon, 9 Oct 2017 12:35:54 -0400
Subject: [PATCH] Savannah Bug #49907

subdir-objects breaks symbol versioning. See 
https://savannah.gnu.org/bugs/?49907
---
 lib/driver/Makefile.am  | 11 +++++------
 lib/iso9660/Makefile.am | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

Index: libcdio-0.94/lib/driver/Makefile.am
===================================================================
--- libcdio-0.94.orig/lib/driver/Makefile.am
+++ libcdio-0.94/lib/driver/Makefile.am
@@ -176,13 +176,12 @@ if BUILD_VERSIONED_LIBS
 libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -Wl,--version-script=libcdio.la.ver
 libcdio_la_DEPENDENCIES = libcdio.la.ver
 
-libcdio.la.ver: $(libcdio_la_OBJECTS) $(srcdir)/libcdio.sym
+libcdio.la.ver: $(srcdir)/libcdio.sym
        @echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@
-       @objs=`for obj in $(libcdio_la_OBJECTS); do sed -ne 
"s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
-       if test -n "$${objs}" ; then \
-         nm $${objs} | sed -n -e 's/^.*[       ][ABCDGIRSTW][ABCDGIRSTW]*[     
][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while 
read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then if test 
$$first = true; then echo "  global:"; first=false; fi; echo "    $${symbol};"; 
fi; done; } >> $@; \
-         nm $${objs} | sed -n -e 's/^.*[       ][ABCDGIRSTW][ABCDGIRSTW]*[     
][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while 
read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then :; else 
if test $$first = true; then echo "  local:"; first=false; fi; echo "    
$${symbol};"; fi; done; } >> $@; \
-       fi
+       @echo '  global:' >> $@
+       @sed 's/^/    /;s/$$/;/' $< >> $@
+       @echo '  local:' >> $@
+       @echo '    *;' >> $@
        @echo '};' >> $@
 else
 libcdio_la_LDFLAGS = $(libcdio_la_ldflags)
Index: libcdio-0.94/lib/driver/Makefile.in
===================================================================
--- libcdio-0.94.orig/lib/driver/Makefile.in
+++ libcdio-0.94/lib/driver/Makefile.in
@@ -981,13 +981,12 @@ uninstall-am: uninstall-libLTLIBRARIES
 .PRECIOUS: Makefile
 
 
-@build_versioned_libs_t...@libcdio.la.ver: $(libcdio_la_OBJECTS) 
$(srcdir)/libcdio.sym
+@build_versioned_libs_t...@libcdio.la.ver: $(srcdir)/libcdio.sym
 @BUILD_VERSIONED_LIBS_TRUE@    @echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@
-@BUILD_VERSIONED_LIBS_TRUE@    @objs=`for obj in $(libcdio_la_OBJECTS); do sed 
-ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
-@BUILD_VERSIONED_LIBS_TRUE@    if test -n "$${objs}" ; then \
-@BUILD_VERSIONED_LIBS_TRUE@      nm $${objs} | sed -n -e 's/^.*[       
][ABCDGIRSTW][ABCDGIRSTW]*[     ][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | 
sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" 
$(srcdir)/libcdio.sym; then if test $$first = true; then echo "  global:"; 
first=false; fi; echo "    $${symbol};"; fi; done; } >> $@; \
-@BUILD_VERSIONED_LIBS_TRUE@      nm $${objs} | sed -n -e 's/^.*[       
][ABCDGIRSTW][ABCDGIRSTW]*[     ][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | 
sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" 
$(srcdir)/libcdio.sym; then :; else if test $$first = true; then echo "  
local:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@; \
-@BUILD_VERSIONED_LIBS_TRUE@    fi
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '  global:' >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @sed 's/^/    /;s/$$/;/' $< >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '  local:' >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '    *;' >> $@
 @BUILD_VERSIONED_LIBS_TRUE@    @echo '};' >> $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: libcdio-0.94/lib/iso9660/Makefile.am
===================================================================
--- libcdio-0.94.orig/lib/iso9660/Makefile.am
+++ libcdio-0.94/lib/iso9660/Makefile.am
@@ -132,13 +132,12 @@ if BUILD_VERSIONED_LIBS
 libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) 
-Wl,--version-script=libiso9660.la.ver
 libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver
 
-libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym
+libiso9660.la.ver: $(srcdir)/libiso9660.sym
        @echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@
-       @objs=`for obj in $(libiso9660_la_OBJECTS); do sed -ne 
"s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
-       if test -n "$$objs" ; then \
-         nm $${objs} | sed -n -e 's/^.*[       ][ABCDGIRSTW][ABCDGIRSTW]*[     
][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while 
read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then if 
test $$first = true; then echo "  global:"; first=false; fi; echo "    
$${symbol};"; fi; done; } >> $@; \
-         nm $${objs} | sed -n -e 's/^.*[       ][ABCDGIRSTW][ABCDGIRSTW]*[     
][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while 
read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then :; 
else if test $$first = true; then echo "  local:"; first=false; fi; echo "    
$${symbol};"; fi; done; } >> $@; \
-       fi
+       @echo '  global:' >> $@
+       @sed 's/^/    /;s/$$/;/' $< >> $@
+       @echo '  local:' >> $@
+       @echo '    *;' >> $@
        @echo '};' >> $@
 
 MOSTLYCLEANFILES = libiso9660.la.ver
Index: libcdio-0.94/lib/iso9660/Makefile.in
===================================================================
--- libcdio-0.94.orig/lib/iso9660/Makefile.in
+++ libcdio-0.94/lib/iso9660/Makefile.in
@@ -824,13 +824,12 @@ uninstall-am: uninstall-libLTLIBRARIES
 .PRECIOUS: Makefile
 
 
-@build_versioned_libs_t...@libiso9660.la.ver: $(libiso9660_la_OBJECTS) 
$(srcdir)/libiso9660.sym
+@build_versioned_libs_t...@libiso9660.la.ver: $(srcdir)/libiso9660.sym
 @BUILD_VERSIONED_LIBS_TRUE@    @echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@
-@BUILD_VERSIONED_LIBS_TRUE@    @objs=`for obj in $(libiso9660_la_OBJECTS); do 
sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \
-@BUILD_VERSIONED_LIBS_TRUE@    if test -n "$$objs" ; then \
-@BUILD_VERSIONED_LIBS_TRUE@      nm $${objs} | sed -n -e 's/^.*[       
][ABCDGIRSTW][ABCDGIRSTW]*[     ][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | 
sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" 
$(srcdir)/libiso9660.sym; then if test $$first = true; then echo "  global:"; 
first=false; fi; echo "    $${symbol};"; fi; done; } >> $@; \
-@BUILD_VERSIONED_LIBS_TRUE@      nm $${objs} | sed -n -e 's/^.*[       
][ABCDGIRSTW][ABCDGIRSTW]*[     ][      ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | 
sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" 
$(srcdir)/libiso9660.sym; then :; else if test $$first = true; then echo "  
local:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@; \
-@BUILD_VERSIONED_LIBS_TRUE@    fi
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '  global:' >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @sed 's/^/    /;s/$$/;/' $< >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '  local:' >> $@
+@BUILD_VERSIONED_LIBS_TRUE@    @echo '    *;' >> $@
 @BUILD_VERSIONED_LIBS_TRUE@    @echo '};' >> $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.



Reply via email to