- updated to 2.2.2

- updated ldconfig patch

diff --git a/discount-ldconfig.patch b/discount-ldconfig.patch
index c5c6017222d3db66649046e672576cca00fc82bf..9e6c57342a0f736a2cc5f014fa64830fd1129584 100644 (file)
--- a/discount-ldconfig.patch
+++ b/discount-ldconfig.patch
@@ -1,10 +1,11 @@
---- configure.inc.orig 2012-01-22 23:48:19.262732384 +0000
-+++ configure.inc      2012-01-22 23:48:49.529329922 +0000
-@@ -1267,7 +1267,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"
+--- discount-2.2.2/configure.inc.orig  2017-02-26 12:31:46.399778068 +0100
++++ discount-2.2.2/configure.inc       2017-02-26 12:32:51.019777329 +0100
+@@ -1372,7 +1372,7 @@
+       $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME.\$MAJOR"
+       $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME"
+ EOF
+-    test "$LDCONFIG" && echo '        '$LDCONFIG '"$1"' >> librarian.sh
++    test "$LDCONFIG" && echo '        '$LDCONFIG '"$1" || :' >> librarian.sh
+     cat >> librarian.sh << EOF
        ;;
  esac
- EOF

diff --git a/discount.spec b/discount.spec
index ceb5256f6d2782f1c51e5b99014f66dcf6c9b2cc..4dad214df3964a362cb100f045f58b7096524f4c 100644 (file)
--- a/discount.spec
+++ b/discount.spec
@@ -1,12 +1,12 @@
 Summary:       A command-line utility for converting Markdown files into HTML
 Summary(pl.UTF-8):     Działające z linii poleceń narzędzie do konwersji plików Markdown do HTML-a
 Name:          discount
-Version:       2.1.8a
+Version:       2.2.2
 Release:       1
 License:       BSD
 Group:         Applications/Text
 Source0:       http://www.pell.portland.or.us/~orc/Code/discount/%{name}-%{version}.tar.bz2
-# Source0-md5: edada8cc01accc2c0a634871991b4e08
+# Source0-md5: 0531fc428f023942b364c781a948df08
 Patch0:                %{name}-ldconfig.patch
 URL:           http://www.pell.portland.or.us/~orc/Code/discount
 Requires:      libmarkdown = %{version}-%{release}
@@ -51,7 +51,7 @@ biblioteki libmarkdown.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 # NOTE: not autoconf based configure