- Update to version 2.2.2:

* No changelog provided
- Refresh patches:
  * discount-disable_ldconfig.patch
  * discount-fix-compile-warings.diff

OBS-URL: https://build.opensuse.org/package/show/Publishing/discount?expand=0&rev=13
This commit is contained in:
Martin Pluskal 2017-02-09 16:16:58 +00:00 committed by Git OBS Bridge
parent 3f3b6078e0
commit ebddb6956d
6 changed files with 31 additions and 21 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88458c7c2cfc870f8e6cf42b300408c112e05a45c88f8af35abb33de0e96fe0e
size 88658

3
discount-2.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64
size 89288

View File

@ -2,7 +2,7 @@ Index: configure.inc
=================================================================== ===================================================================
--- configure.inc.orig --- configure.inc.orig
+++ configure.inc +++ configure.inc
@@ -1309,7 +1309,6 @@ __AC_ELF_LIBRARIAN() { @@ -1337,7 +1337,6 @@ __AC_ELF_LIBRARIAN() {
if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
USE_SONAME=T USE_SONAME=T
fi fi
@ -10,9 +10,9 @@ Index: configure.inc
__config_files="$__config_files librarian.sh" __config_files="$__config_files librarian.sh"
cat > librarian.sh << EOF cat > librarian.sh << EOF
#! /bin/sh #! /bin/sh
@@ -1344,7 +1343,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1 @@ -1372,7 +1371,6 @@ install)$PROG_INSTALL -c "\$FULLNAME" "\
$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME.\$MAJOR"
$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME $PROG_LN_S -f "\$FULLNAME" "\$1/\$LIBNAME"
EOF EOF
- test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh - test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh
cat >> librarian.sh << EOF cat >> librarian.sh << EOF

View File

@ -2,7 +2,7 @@ Index: Makefile.in
=================================================================== ===================================================================
--- Makefile.in.orig --- Makefile.in.orig
+++ Makefile.in +++ Makefile.in
@@ -113,9 +113,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify @@ -115,9 +115,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify
done done
cols: tools/cols.c config.h cols: tools/cols.c config.h

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Feb 9 16:09:59 UTC 2017 - mpluskal@suse.com
- Update to version 2.2.2:
* No changelog provided
- Refresh patches:
* discount-disable_ldconfig.patch
* discount-fix-compile-warings.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 16 15:18:22 UTC 2016 - mpluskal@suse.com Sun Oct 16 15:18:22 UTC 2016 - mpluskal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package discount # spec file for package discount
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,10 +16,10 @@
# #
%define soname 2 %define sover 2
%bcond_with fenced_code %bcond_with fenced_code
Name: discount Name: discount
Version: 2.2.1 Version: 2.2.2
Release: 0 Release: 0
Summary: Markdown text to HTML converter Summary: Markdown text to HTML converter
License: BSD-3-Clause License: BSD-3-Clause
@ -37,11 +37,11 @@ Discount is an implementation of John Grubers Markdown text to HTML language
with some extensions from PHP Markdown Extra, Pandoc, and other implementations with some extensions from PHP Markdown Extra, Pandoc, and other implementations
of Markdown. of Markdown.
%package -n libmarkdown%{soname} %package -n libmarkdown%{sover}
Summary: Markdown text to HTML converter library Summary: Markdown text to HTML converter library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description -n libmarkdown%{soname} %description -n libmarkdown%{sover}
Discount is an implementation of John Grubers Markdown text to HTML language Discount is an implementation of John Grubers Markdown text to HTML language
with some extensions from PHP Markdown Extra, Pandoc, and other implementations with some extensions from PHP Markdown Extra, Pandoc, and other implementations
of Markdown. of Markdown.
@ -49,7 +49,7 @@ of Markdown.
%package -n libmarkdown-devel %package -n libmarkdown-devel
Summary: Markdown text to HTML converter library Summary: Markdown text to HTML converter library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libmarkdown%{soname} = %{version} Requires: libmarkdown%{sover} = %{version}
%description -n libmarkdown-devel %description -n libmarkdown-devel
Discount is an implementation of John Grubers Markdown text to HTML language Discount is an implementation of John Grubers Markdown text to HTML language
@ -79,7 +79,9 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
%install %install
make DESTDIR=%{buildroot} install.everything make DESTDIR=%{buildroot} install.everything
%fdupes -s %{buildroot}%{_mandir}/man3 %fdupes -s %{buildroot}%{_mandir}/man3
install -D -p -m 0644 libmarkdown.pc \
%{buildroot}%{_libdir}/libmarkdown.pc
# update-alternatives # update-alternatives
mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/discount-markdown mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/discount-markdown
@ -96,8 +98,8 @@ if [ $1 -eq 0 ] ; then
update-alternatives --remove markdown %{_bindir}/discount-markdown update-alternatives --remove markdown %{_bindir}/discount-markdown
fi fi
%post -n libmarkdown%{soname} -p /sbin/ldconfig %post -n libmarkdown%{sover} -p /sbin/ldconfig
%postun -n libmarkdown%{soname} -p /sbin/ldconfig %postun -n libmarkdown%{sover} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -112,16 +114,15 @@ fi
%{_mandir}/man7/markdown.7%{ext_man} %{_mandir}/man7/markdown.7%{ext_man}
%{_mandir}/man7/mkd-extensions.7%{ext_man} %{_mandir}/man7/mkd-extensions.7%{ext_man}
%files -n libmarkdown%{soname} %files -n libmarkdown%{sover}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libmarkdown.so.%{soname} %{_libdir}/libmarkdown.so.%{sover}*
%{_libdir}/libmarkdown.so.%{soname}.*
%files -n libmarkdown-devel %files -n libmarkdown-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/mkdio.h %{_includedir}/mkdio.h
%{_libdir}/libmarkdown.so %{_libdir}/libmarkdown.so
%{_libdir}/pkgconfig/libmarkdown.pc %{_libdir}/libmarkdown.pc
%{_mandir}/man3/*.3%{ext_man} %{_mandir}/man3/*.3%{ext_man}
%changelog %changelog