[packages/discount] - updated to 2.2.2 - updated ldconfig patch

qboosh qboosh at pld-linux.org
Sun Feb 26 12:40:13 CET 2017


commit 60d15eddcb92aec4ad04f739f26f9694c0c69fb9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 26 12:42:11 2017 +0100

    - updated to 2.2.2
    - updated ldconfig patch

 discount-ldconfig.patch | 17 +++++++++--------
 discount.spec           |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/discount.spec b/discount.spec
index ceb5256..4dad214 100644
--- 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
diff --git a/discount-ldconfig.patch b/discount-ldconfig.patch
index c5c6017..9e6c573 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/discount.git/commitdiff/60d15eddcb92aec4ad04f739f26f9694c0c69fb9



More information about the pld-cvs-commit mailing list