From 1ac1163813c31b4cb99e4b7e1376fcd039e80d8a1c52f79d2dac38e170cafcfe Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 2 May 2016 19:15:25 +0000
Subject: [PATCH] Accepting request 393189 from
 home:pluskalm:branches:Publishing

- Update to 2.2.0
  * no changelog provided
- Build with optflags
- Refresh discount-disable_ldconfig.patch

OBS-URL: https://build.opensuse.org/request/show/393189
OBS-URL: https://build.opensuse.org/package/show/Publishing/discount?expand=0&rev=9
---
 discount-2.1.8a.tar.bz2         |  3 ---
 discount-2.2.0.tar.bz2          |  3 +++
 discount-disable_ldconfig.patch | 10 +++++-----
 discount.changes                |  8 ++++++++
 discount.spec                   | 11 ++++-------
 5 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 discount-2.1.8a.tar.bz2
 create mode 100644 discount-2.2.0.tar.bz2

diff --git a/discount-2.1.8a.tar.bz2 b/discount-2.1.8a.tar.bz2
deleted file mode 100644
index baba7ec..0000000
--- a/discount-2.1.8a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526
-size 85161
diff --git a/discount-2.2.0.tar.bz2 b/discount-2.2.0.tar.bz2
new file mode 100644
index 0000000..77b10eb
--- /dev/null
+++ b/discount-2.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b25395c29c2c08836199eb2eae87b56e6b545e77f5fbf921678aa1dc0ddab9f3
+size 88387
diff --git a/discount-disable_ldconfig.patch b/discount-disable_ldconfig.patch
index 26fde2d..60253cc 100644
--- a/discount-disable_ldconfig.patch
+++ b/discount-disable_ldconfig.patch
@@ -2,7 +2,7 @@ Index: configure.inc
 ===================================================================
 --- configure.inc.orig
 +++ configure.inc
-@@ -1270,7 +1270,6 @@ __AC_ELF_LIBRARIAN() {
+@@ -1297,7 +1297,6 @@ __AC_ELF_LIBRARIAN() {
      if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
  	USE_SONAME=T
      fi
@@ -10,11 +10,11 @@ Index: configure.inc
      __config_files="$__config_files librarian.sh"
      cat > librarian.sh << EOF
  #! /bin/sh
-@@ -1304,7 +1303,6 @@ files)  echo "\$FULLNAME" "\$LIBNAME" "\
- install)$PROG_INSTALL -c \$FULLNAME "\$1"
+@@ -1332,7 +1331,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1
  	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
  	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
--	test "$LDCONFIG" && $LDCONFIG "\$1"
+ EOF
+-    test "$LDCONFIG" && echo '	'$LDCONFIG '"$1"' >> librarian.sh
+     cat >> librarian.sh << EOF
  	;;
  esac
- EOF
diff --git a/discount.changes b/discount.changes
index e084226..f63d274 100644
--- a/discount.changes
+++ b/discount.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun May  1 15:29:28 UTC 2016 - mpluskal@suse.com
+
+- Update to 2.2.0
+  * no changelog provided
+- Build with optflags
+- Refresh discount-disable_ldconfig.patch
+
 -------------------------------------------------------------------
 Thu May 21 11:59:36 UTC 2015 - mailaender@opensuse.org
 
diff --git a/discount.spec b/discount.spec
index 4ea809c..9d64c7b 100644
--- a/discount.spec
+++ b/discount.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package discount
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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,11 +16,10 @@
 #
 
 
-%bcond_with fenced_code
 %define soname 2
-
+%bcond_with fenced_code
 Name:           discount
-Version:        2.1.8a
+Version:        2.2.0
 Release:        0
 Summary:        Markdown text to HTML converter
 License:        BSD-3-Clause
@@ -69,8 +68,6 @@ of Markdown.
 %patch2 -p1
 
 %build
-CC="gcc" \
-CFLAGS="%{optflags}" \
 ./configure.sh \
     --shared \
     --prefix="%{_prefix}" \
@@ -84,7 +81,7 @@ CFLAGS="%{optflags}" \
     --with-dl=BOTH \
     --enable-all-features
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
 
 %install
 install -d "%{buildroot}%{_bindir}"