diff --git a/discount-2.2.2.tar.bz2 b/discount-2.2.2.tar.bz2 deleted file mode 100644 index c829a15..0000000 --- a/discount-2.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 -size 89288 diff --git a/discount-2.2.3a.tar.bz2 b/discount-2.2.3a.tar.bz2 new file mode 100644 index 0000000..ee27556 --- /dev/null +++ b/discount-2.2.3a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75f5d5fda2e9607a5c77455296b41e5dd436389e20f35c37bea395d35aea0954 +size 98325 diff --git a/discount-disable_ldconfig.patch b/discount-disable_ldconfig.patch index f6b1eb3..4452ece 100644 --- a/discount-disable_ldconfig.patch +++ b/discount-disable_ldconfig.patch @@ -1,18 +1,18 @@ -Index: configure.inc +Index: discount-2.2.3a/configure.inc =================================================================== ---- configure.inc.orig -+++ configure.inc -@@ -1337,7 +1337,6 @@ __AC_ELF_LIBRARIAN() { +--- discount-2.2.3a.orig/configure.inc ++++ discount-2.2.3a/configure.inc +@@ -1388,7 +1388,6 @@ __AC_ELF_LIBRARIAN() { if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then USE_SONAME=T fi - LDCONFIG=`AC_PATH=/sbin:/usr/sbin:/usr/local/sbin acLookFor ldconfig` - __config_files="$__config_files librarian.sh" - cat > librarian.sh << EOF - #! /bin/sh -@@ -1372,7 +1371,6 @@ install)$PROG_INSTALL -c "\$FULLNAME" "\ - $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME.\$MAJOR" - $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME" + + if [ "$LDCONFIG" ]; then + case `uname -s 2>/dev/null | $AC_UPPERCASE` in +@@ -1434,7 +1433,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1 + $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR + $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME EOF - test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh cat >> librarian.sh << EOF diff --git a/discount-fix-compile-warings.diff b/discount-fix-compile-warings.diff index ae2383d..651a657 100644 --- a/discount-fix-compile-warings.diff +++ b/discount-fix-compile-warings.diff @@ -1,10 +1,10 @@ -Index: Makefile.in +Index: discount-2.2.3a/Makefile.in =================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -115,9 +115,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify - done - +--- discount-2.2.3a.orig/Makefile.in ++++ discount-2.2.3a/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 diff --git a/discount.changes b/discount.changes index 1a57d65..5ba3d3f 100644 --- a/discount.changes +++ b/discount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 25 09:11:13 UTC 2018 - mpluskal@suse.com + +- Update to version 2.2.3a: + * No changelog provided +- Refresh patches: + * discount-disable_ldconfig.patch + * discount-fix-compile-warings.diff + ------------------------------------------------------------------- Fri Nov 3 09:31:38 UTC 2017 - mpluskal@suse.com diff --git a/discount.spec b/discount.spec index 823776f..f67d9eb 100644 --- a/discount.spec +++ b/discount.spec @@ -1,7 +1,7 @@ # # spec file for package discount # -# 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 @@ -19,12 +19,12 @@ %define sover 2 %bcond_with fenced_code Name: discount -Version: 2.2.2 +Version: 2.2.3a 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: http://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 @@ -58,8 +58,8 @@ of Markdown. %prep %setup -q -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %build ./configure.sh \ @@ -109,9 +109,9 @@ fi %ghost %{_sysconfdir}/alternatives/markdown %{_bindir}/mkd2html %{_bindir}/theme -%{_mandir}/man1/*.1%{ext_man} -%{_mandir}/man7/markdown.7%{ext_man} -%{_mandir}/man7/mkd-extensions.7%{ext_man} +%{_mandir}/man1/*.1%{?ext_man} +%{_mandir}/man7/markdown.7%{?ext_man} +%{_mandir}/man7/mkd-extensions.7%{?ext_man} %files -n libmarkdown%{sover} %{_libdir}/libmarkdown.so.%{sover}* @@ -120,6 +120,6 @@ fi %{_includedir}/mkdio.h %{_libdir}/libmarkdown.so %{_libdir}/pkgconfig/libmarkdown.pc -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3%{?ext_man} %changelog