From 2a565aeaa0f4c75c3b0de43a932aba41f55c75a58f03b35782bc1f0bd11de8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 21 Jan 2020 12:23:02 +0000 Subject: [PATCH] - Drop not really needed patch: * 0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch - Fix build on SLE12 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/QR-Code-generator?expand=0&rev=4 --- ...-C-XX-FLAGS-but-just-set-them-if-not.patch | 40 ------------------- QR-Code-generator.changes | 7 ++++ QR-Code-generator.spec | 12 +++++- 3 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch diff --git a/0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch b/0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch deleted file mode 100644 index c112fbc..0000000 --- a/0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f0823adc2f7224aad3a1060a4eede4adad5858f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 11:57:24 +0100 -Subject: [PATCH 1/5] Do not append to C/XX/FLAGS but just set them if not - defined already - ---- - c/Makefile | 2 +- - cpp/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index fd0c367..b27449c 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -29,7 +29,7 @@ - # - CFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CFLAGS += -std=c99 -O -+CFLAGS ?= -std=c99 -O - - # Extra flags for diagnostics: - # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address -diff --git a/cpp/Makefile b/cpp/Makefile -index 1d32943..62e03c5 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -29,7 +29,7 @@ - # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CXXFLAGS += -std=c++11 -O -+CXXFLAGS ?= -std=c++11 -O - - # Extra flags for diagnostics: - # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address --- -2.24.0 - diff --git a/QR-Code-generator.changes b/QR-Code-generator.changes index cc1e5fa..d819ebc 100644 --- a/QR-Code-generator.changes +++ b/QR-Code-generator.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 21 12:19:03 UTC 2020 - Tomáš Chvátal + +- Drop not really needed patch: + * 0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch +- Fix build on SLE12 + ------------------------------------------------------------------- Tue Dec 3 12:01:27 UTC 2019 - Tomáš Chvátal diff --git a/QR-Code-generator.spec b/QR-Code-generator.spec index eb61ef8..014602a 100644 --- a/QR-Code-generator.spec +++ b/QR-Code-generator.spec @@ -1,7 +1,7 @@ # # spec file for package QR-Code-generator # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,6 @@ License: MIT URL: https://github.com/nayuki/QR-Code-generator Source: https://github.com/nayuki/QR-Code-generator/archive/v%{version}.tar.gz Patch0: cflags.patch -Patch1: 0001-Do-not-append-to-C-XX-FLAGS-but-just-set-them-if-not.patch Patch2: 0002-Make-use-of-fPIC-parameter-when-building.patch Patch3: 0003-Generate-both-shared-and-static-libraries.patch Patch4: 0004-Create-install-targets-for-C-and-CPP.patch @@ -42,6 +41,15 @@ This project aims to be the best, clearest QR Code generator library in multiple The primary goals are flexible options and absolute correctness. Secondary goals are compact implementation size and good documentation comments. +%if 0%{?suse_version} < 1500 +# this is hack to make rpm happy as %python_subpackage does not work +%package -n python-%{name} +Summary: QR Code generator python bindings + +%description -n python-%{name} +QR Code generator python2 bindings +%endif + %package devel Summary: Development files for QR code generator Requires: %{libcname}