Accepting request 568887 from KDE:Distro:Factory

- Update to 4.0.0
  * EPS output now supports foreground and background color
  * XPM and PNG32 support added
  * CMake support added
  * Various bugs and performance fixes
- Add qrencode-fix-installation.patch. Fixes installation for x86_64
  targets.

OBS-URL: https://build.opensuse.org/request/show/568887
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qrencode?expand=0&rev=21

baselibs.conf

@@ -1 +1 @@
-libqrencode3
+libqrencode4

qrencode-3.4.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5
-size 369136

qrencode-4.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c90035e16921117d4086a7fdee65aab85be32beb4a376f6b664b8a425d327d0b
+size 429244

qrencode-fix-installation.patch

@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f08b2cb..b87d2ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,7 @@ endif()
+ 
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "${CMAKE_INSTALL_PREFIX}/bin")
+-set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
++set(libdir "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ set(includedir "${CMAKE_INSTALL_PREFIX}/include")
+ set(VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+ 
+@@ -118,9 +118,9 @@ configure_file(qrencode.1.in qrencode.1 @ONLY)
+ configure_file(libqrencode.pc.in libqrencode.pc @ONLY)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qrencode.1 DESTINATION share/man/man1)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqrencode.pc DESTINATION lib/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqrencode.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ install(FILES qrencode.h DESTINATION include)
+-install(TARGETS qrencode DESTINATION lib)
++install(TARGETS qrencode DESTINATION lib${LIB_SUFFIX})
+ 
+ ## Build utility tools
+ if(WITH_TOOLS AND TARGET PNG::PNG)

qrencode.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan 24 10:57:58 UTC 2018 - christophe@krop.fr
+
+- Update to 4.0.0
+  * EPS output now supports foreground and background color
+  * XPM and PNG32 support added
+  * CMake support added
+  * Various bugs and performance fixes
+- Add qrencode-fix-installation.patch. Fixes installation for x86_64
+  targets.
+
 -------------------------------------------------------------------
 Tue Jul 18 14:23:32 UTC 2017 - tchvatal@suse.com
 

qrencode.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qrencode
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,9 +16,9 @@
 #
 
 
-%define so_ver 3
+%define so_ver 4
 Name:           qrencode
-Version:        3.4.4
+Version:        4.0.0
 Release:        0
 Summary:        C library for encoding data in a QR Code symbol
 License:        LGPL-2.1+
@@ -26,6 +26,9 @@ Group:          Productivity/Graphics/Other
 Url:            https://github.com/fukuchi/libqrencode
 Source0:        http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
+# PATCH-FIX-UPSTREAM -- qrencode-fix_installation.patch
+Patch0:         qrencode-fix-installation.patch
+BuildRequires:  cmake >= 3.1.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libpng)
 
@@ -60,15 +63,14 @@ This package contains the development files for libqrencode.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure \
-  --with-tools
-make %{?_smp_mflags}
+%cmake -DBUILD_SHARED_LIBS=TRUE
+%make_jobs
 
 %install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+%cmake_install
 
 %post -n libqrencode%{so_ver} -p /sbin/ldconfig
 %postun -n libqrencode%{so_ver} -p /sbin/ldconfig