Hello community, here is the log from the commit of package exiv2 for openSUSE:Factory checked in at 2017-07-24 12:29:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exiv2 (Old) and /work/SRC/openSUSE:Factory/.exiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exiv2" Mon Jul 24 12:29:48 2017 rev:45 rq:508326 version:0.26 Changes: -------- --- /work/SRC/openSUSE:Factory/exiv2/exiv2.changes 2016-05-23 17:30:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.exiv2.new/exiv2.changes 2017-07-24 12:29:49.807475216 +0200 @@ -1,0 +2,15 @@ +Tue Jul 4 09:09:22 UTC 2017 - [email protected] + +- Fix baselibs.conf + +------------------------------------------------------------------- +Fri Jun 30 14:49:55 UTC 2017 - [email protected] + +- Update to version 0.26 + * See http://www.exiv2.org/changelog.html +- Add gcc-version-check.patch to fix build on Tumbleweed +- Dropped the following upstreamed patches: + * exiv2-cmake-libsuffix.patch + * exiv2_r3889_r3890_fix_boo964344.diff + +------------------------------------------------------------------- Old: ---- exiv2-0.25.tar.gz exiv2-cmake-libsuffix.patch exiv2_r3889_r3890_fix_boo964344.diff New: ---- exiv2-0.26-trunk.tar.gz gcc-version-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiv2.spec ++++++ --- /var/tmp/diff_new_pack.WNfK7k/_old 2017-07-24 12:29:50.727345418 +0200 +++ /var/tmp/diff_new_pack.WNfK7k/_new 2017-07-24 12:29:50.727345418 +0200 @@ -1,7 +1,7 @@ # # spec file for package exiv2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,19 +17,18 @@ Name: exiv2 -Version: 0.25 +Version: 0.26 Release: 0 Summary: Tool to access image Exif metadata License: GPL-2.0+ Group: Productivity/Graphics/Other Url: http://www.exiv2.org/ -Source0: http://www.exiv2.org/%{name}-%{version}.tar.gz +Source0: http://www.exiv2.org/builds/%{name}-%{version}-trunk.tar.gz Source1: baselibs.conf Patch1: exiv2-build-date.patch -# PATCH-FIX-UPSTREAM exiv2-cmake-libsuffix.patch [email protected] -- Install libraries to lib64 on respective archs -Patch5: exiv2-cmake-libsuffix.patch -Patch6: parallel-build-dep.patch -Patch7: exiv2_r3889_r3890_fix_boo964344.diff +Patch2: parallel-build-dep.patch +# PATCH-FIX-OPENSUSE gcc-version-check.patch -- fix build with GCC7 on Tumbleweed +Patch3: gcc-version-check.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -49,18 +48,18 @@ Exiv2 is a command line utility to access image metadata from tags like Exif. -%package -n libexiv2-14 +%package -n libexiv2-26 Summary: Library to access image metadata Group: System/Libraries -%description -n libexiv2-14 +%description -n libexiv2-26 libexiv2 is a C++ library with a C compatibility interface to access image metadata, esp from Exif tags. %package -n libexiv2-devel Summary: Development Headers for Exiv2 Group: Development/Libraries/C and C++ -Requires: libexiv2-14 = %{version} +Requires: libexiv2-26 = %{version} Requires: libstdc++-devel %description -n libexiv2-devel @@ -69,11 +68,12 @@ %lang_package %prep -%setup -q +%setup -q -n %{name}-trunk %patch1 -p1 -%patch5 -p1 -%patch6 -%patch7 +%patch2 +%patch3 -p1 +# remove Apple resource forks included in the tarball, they cause the translations build to fail +rm po/._* %build export CXXFLAGS="%optflags $(getconf LFS_CFLAGS)" @@ -88,11 +88,12 @@ %find_lang exiv2 %fdupes -s doc/html rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.a rm %{buildroot}%{_libdir}/pkgconfig/exiv2.lsm -%post -n libexiv2-14 -p /sbin/ldconfig +%post -n libexiv2-26 -p /sbin/ldconfig -%postun -n libexiv2-14 -p /sbin/ldconfig +%postun -n libexiv2-26 -p /sbin/ldconfig %files lang -f exiv2.lang @@ -102,7 +103,7 @@ %{_bindir}/exiv2 %{_mandir}/man1/* -%files -n libexiv2-14 +%files -n libexiv2-26 %defattr(-,root,root) %{_libdir}/libexiv2.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.WNfK7k/_old 2017-07-24 12:29:50.767339774 +0200 +++ /var/tmp/diff_new_pack.WNfK7k/_new 2017-07-24 12:29:50.767339774 +0200 @@ -1 +1 @@ -libexiv2-14 +libexiv2-26 ++++++ exiv2-build-date.patch ++++++ --- /var/tmp/diff_new_pack.WNfK7k/_old 2017-07-24 12:29:50.779338082 +0200 +++ /var/tmp/diff_new_pack.WNfK7k/_new 2017-07-24 12:29:50.779338082 +0200 @@ -1,7 +1,7 @@ -diff -urB exiv2-0.25/config/Doxyfile new/config/Doxyfile ---- exiv2-0.25/config/Doxyfile 2015-06-18 13:28:13.000000000 +0200 -+++ new/config/Doxyfile 2015-06-22 14:38:39.341452977 +0200 -@@ -978,7 +978,7 @@ +diff -urB exiv2-trunk/config/Doxyfile new/config/Doxyfile +--- exiv2-trunk/config/Doxyfile 2017-03-16 19:13:12.000000000 +0100 ++++ new/config/Doxyfile 2017-05-07 13:03:56.000000000 +0200 +@@ -981,7 +981,7 @@ # page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. @@ -10,10 +10,10 @@ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the -diff -urB exiv2-0.25/samples/geotag.cpp new/samples/geotag.cpp ---- exiv2-0.25/samples/geotag.cpp 2015-06-08 16:39:59.000000000 +0200 -+++ new/samples/geotag.cpp 2015-06-22 14:38:39.342452980 +0200 -@@ -682,7 +682,7 @@ +diff -urB exiv2-trunk/samples/geotag.cpp new/samples/geotag.cpp +--- exiv2-trunk/samples/geotag.cpp 2016-09-29 19:06:02.000000000 +0200 ++++ new/samples/geotag.cpp 2017-05-07 13:04:39.000000000 +0200 +@@ -667,7 +667,7 @@ int version(const char* program) { @@ -22,12 +22,12 @@ return 0; } -diff -urB exiv2-0.25/src/version.cpp new/src/version.cpp ---- exiv2-0.25/src/version.cpp 2015-05-09 00:26:36.000000000 +0200 -+++ new/src/version.cpp 2015-06-22 14:39:40.218650167 +0200 -@@ -455,8 +455,6 @@ - output(os,keys,"dll" , dll ); - output(os,keys,"debug" , debug ); +diff -urB exiv2-trunk/src/version.cpp new/src/version.cpp +--- exiv2-trunk/src/version.cpp 2017-04-23 21:29:19.000000000 +0200 ++++ new/src/version.cpp 2017-05-07 13:05:20.000000000 +0200 +@@ -524,8 +524,6 @@ + output(os,keys,"cplusplus" , __cplusplus); + output(os,keys,"cplusplus11" , __cplusplus >= CPLUSPLUS11 ); output(os,keys,"version" , __VERSION__); - output(os,keys,"date" , __DATE__ ); - output(os,keys,"time" , __TIME__ ); ++++++ gcc-version-check.patch ++++++ >From aaebd3d52c1ca81a3c865fd5013fd65e359097b4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Fri, 30 Jun 2017 16:42:48 +0200 Subject: [PATCH] Fix getting GCC version with openSUSE's GCC7 On openSUSE Tumbleweed, "gcc -dumpversion" just reports '7'. Therefore the ${GCC_VERSION_COMPONENTS} list only contains one entry and trying to get GCC_MINOR fails because it tries to access a non-existing list element. To fix the build, append '0' to the list to make sure it always has at least 2 elements. If there are two already, the additional one is just being ignored. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 130cb56e..a6a23141 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,7 @@ IF( MINGW OR UNIX ) execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION}) + list(APPEND GCC_VERSION_COMPONENTS 0) list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR) list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR) -- 2.12.3 ++++++ parallel-build-dep.patch ++++++ --- /var/tmp/diff_new_pack.WNfK7k/_old 2017-07-24 12:29:50.807334131 +0200 +++ /var/tmp/diff_new_pack.WNfK7k/_new 2017-07-24 12:29:50.807334131 +0200 @@ -2,12 +2,12 @@ =================================================================== --- src/Makefile.orig +++ src/Makefile -@@ -169,7 +169,7 @@ CCLOBJ = $(CCSRC:.cpp=.lo) +@@ -170,7 +170,7 @@ CCLOBJ = $(CCSRC:.cpp=.lo) COBJ = $(CSRC:.c=.o) CLOBJ = $(CSRC:.c=.lo) -SRC = $(CCSRC) $(CSRC) +SRC = $(CCSRC) $(CSRC) $(EXIV2MAIN) - HDR = $(CCHDR) + HDR = $(CCHDR) rwlock.hpp OBJ = $(CCOBJ) $(COBJ) LOBJ = $(CCLOBJ) $(CLOBJ)
