From 9831012e02b05b9ce1f7fc09eae256b91a25132bd4a2a723abf5d957dfa8cccc Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 26 Jan 2021 09:15:08 +0000
Subject: [PATCH] - Update to version 2.2.6:   * No changelog provided - Drop
 no longer needed discount-fix-compile-warings.diff

OBS-URL: https://build.opensuse.org/package/show/Publishing/discount?expand=0&rev=24
---
 discount-2.2.4.tar.bz2            |  3 ---
 discount-2.2.6.tar.bz2            |  3 +++
 discount-disable_ldconfig.patch   | 10 +++++-----
 discount-fix-compile-warings.diff | 16 ----------------
 discount.changes                  |  7 +++++++
 discount.spec                     | 16 +++++++---------
 6 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 discount-2.2.4.tar.bz2
 create mode 100644 discount-2.2.6.tar.bz2
 delete mode 100644 discount-fix-compile-warings.diff

diff --git a/discount-2.2.4.tar.bz2 b/discount-2.2.4.tar.bz2
deleted file mode 100644
index be961cc..0000000
--- a/discount-2.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74fd1e3cc2b4eacf7325d3fd89df38b589db60d5dd0f4f14a0115f7da5e230a5
-size 99482
diff --git a/discount-2.2.6.tar.bz2 b/discount-2.2.6.tar.bz2
new file mode 100644
index 0000000..ef999e2
--- /dev/null
+++ b/discount-2.2.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae68a4832ff8e620286304ec525c1fe8957be4d8f1e774588eb03d1c3deb74a7
+size 102303
diff --git a/discount-disable_ldconfig.patch b/discount-disable_ldconfig.patch
index 6674d2e..d8f105d 100644
--- a/discount-disable_ldconfig.patch
+++ b/discount-disable_ldconfig.patch
@@ -1,8 +1,8 @@
-Index: discount-2.2.4/configure.inc
+Index: discount-2.2.6/configure.inc
 ===================================================================
---- discount-2.2.4.orig/configure.inc
-+++ discount-2.2.4/configure.inc
-@@ -1393,7 +1393,6 @@ __AC_ELF_LIBRARIAN() {
+--- discount-2.2.6.orig/configure.inc
++++ discount-2.2.6/configure.inc
+@@ -1455,7 +1455,6 @@ __AC_ELF_LIBRARIAN() {
      if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
  	USE_SONAME=T
      fi
@@ -10,7 +10,7 @@ Index: discount-2.2.4/configure.inc
  
      if [ "$LDCONFIG" ]; then
  	case `uname -s 2>/dev/null | $AC_UPPERCASE` in
-@@ -1439,7 +1438,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1
+@@ -1501,7 +1500,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1
  	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
  	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
  EOF
diff --git a/discount-fix-compile-warings.diff b/discount-fix-compile-warings.diff
deleted file mode 100644
index 487275e..0000000
--- a/discount-fix-compile-warings.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: discount-2.2.4/Makefile.in
-===================================================================
---- discount-2.2.4.orig/Makefile.in
-+++ discount-2.2.4/Makefile.in
-@@ -125,9 +125,9 @@ test:	$(PGMS) $(TESTFRAMEWORK) verify
- branch: tools/branch.c config.h
- 	$(CC) -o branch tools/branch.c
- cols:   tools/cols.c config.h
--	$(CC) -o cols tools/cols.c
-+	$(CC) $(CFLAGS) -o cols tools/cols.c
- echo:   tools/echo.c config.h
--	$(CC) -o echo tools/echo.c
-+	$(CC) $(CFLAGS) -o echo tools/echo.c
- 	
- clean:
- 	rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o
diff --git a/discount.changes b/discount.changes
index 458e7d2..9bfb0a0 100644
--- a/discount.changes
+++ b/discount.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 26 09:04:18 UTC 2021 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 2.2.6:
+  * No changelog provided
+- Drop no longer needed discount-fix-compile-warings.diff
+
 -------------------------------------------------------------------
 Mon Jan  7 14:44:33 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/discount.spec b/discount.spec
index 7944097..abad763 100644
--- a/discount.spec
+++ b/discount.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package discount
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,14 @@
 %define sover 2
 %bcond_with fenced_code
 Name:           discount
-Version:        2.2.4
+Version:        2.2.6
 Release:        0
 Summary:        Markdown text to HTML converter
 License:        BSD-3-Clause
 Group:          Productivity/Text/Convertors
-URL:            http://www.pell.portland.or.us/~orc/Code/discount/
+URL:            https://www.pell.portland.or.us/~orc/Code/discount/
 Source:         http://www.pell.portland.or.us/~orc/Code/discount/discount-%{version}.tar.bz2
 Patch1:         discount-disable_ldconfig.patch
-Patch2:         discount-fix-compile-warings.diff
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 Provides:       markdown
@@ -57,12 +56,10 @@ with some extensions from PHP Markdown Extra, Pandoc, and other implementations
 of Markdown.
 
 %prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
 
 %build
-./configure.sh \
+CFLAGS="%{optflags}" ./configure.sh \
   --shared \
   --prefix="%{_prefix}" \
   --execdir="%{_bindir}" \
@@ -73,8 +70,9 @@ of Markdown.
   --with-fenced-code \
 %endif
   --with-dl=BOTH \
+  --pkg-config \
   --enable-all-features
-make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
+%make_build --jobs=1
 
 %install
 make DESTDIR=%{buildroot} install.everything