diff --git a/discount-2.2.0.tar.bz2 b/discount-2.2.0.tar.bz2 deleted file mode 100644 index 77b10eb..0000000 --- a/discount-2.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b25395c29c2c08836199eb2eae87b56e6b545e77f5fbf921678aa1dc0ddab9f3 -size 88387 diff --git a/discount-2.2.1.tar.bz2 b/discount-2.2.1.tar.bz2 new file mode 100644 index 0000000..dd23a02 --- /dev/null +++ b/discount-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88458c7c2cfc870f8e6cf42b300408c112e05a45c88f8af35abb33de0e96fe0e +size 88658 diff --git a/discount-disable_ldconfig.patch b/discount-disable_ldconfig.patch index 60253cc..fb50dc4 100644 --- a/discount-disable_ldconfig.patch +++ b/discount-disable_ldconfig.patch @@ -2,7 +2,7 @@ Index: configure.inc =================================================================== --- configure.inc.orig +++ configure.inc -@@ -1297,7 +1297,6 @@ __AC_ELF_LIBRARIAN() { +@@ -1309,7 +1309,6 @@ __AC_ELF_LIBRARIAN() { if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then USE_SONAME=T fi @@ -10,7 +10,7 @@ Index: configure.inc __config_files="$__config_files librarian.sh" cat > librarian.sh << EOF #! /bin/sh -@@ -1332,7 +1331,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1 +@@ -1344,7 +1343,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1 $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME EOF diff --git a/discount-fix-compile-warings.diff b/discount-fix-compile-warings.diff index b90f6ae..a917920 100644 --- a/discount-fix-compile-warings.diff +++ b/discount-fix-compile-warings.diff @@ -1,8 +1,8 @@ -diff --git a/Makefile.in b/Makefile.in -index 6b88ebf..6d9609f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -108,9 +108,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -113,9 +113,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify done cols: tools/cols.c config.h diff --git a/discount.changes b/discount.changes index f63d274..9b7915d 100644 --- a/discount.changes +++ b/discount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Oct 16 15:18:22 UTC 2016 - mpluskal@suse.com + +- Update to version 2.2.1: + * No changelog provided +- Refresh patches: + * discount-disable_ldconfig.patch + * discount-fix-compile-warings.diff + ------------------------------------------------------------------- Sun May 1 15:29:28 UTC 2016 - mpluskal@suse.com diff --git a/discount.spec b/discount.spec index 9d64c7b..dcec3b5 100644 --- a/discount.spec +++ b/discount.spec @@ -19,7 +19,7 @@ %define soname 2 %bcond_with fenced_code Name: discount -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: Markdown text to HTML converter License: BSD-3-Clause @@ -28,14 +28,8 @@ 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 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: fdupes -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: libtool -BuildRequires: make -Requires: libmarkdown%{soname} = %{version} +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,35 +59,27 @@ of Markdown. %prep %setup -q %patch1 -%patch2 -p1 +%patch2 %build ./configure.sh \ - --shared \ - --prefix="%{_prefix}" \ - --execdir="%{_bindir}" \ - --confdir="%{_sysconfdir}" \ - --libdir="%{_libdir}" \ - --mandir="%{_mandir}" \ + --shared \ + --prefix="%{_prefix}" \ + --execdir="%{_bindir}" \ + --confdir="%{_sysconfdir}" \ + --libdir="%{_libdir}" \ + --mandir="%{_mandir}" \ %if %{with fenced_code} - --with-fenced-code \ + --with-fenced-code \ %endif - --with-dl=BOTH \ - --enable-all-features - + --with-dl=BOTH \ + --enable-all-features make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" %install -install -d "%{buildroot}%{_bindir}" -install -d "%{buildroot}%{_mandir}" -install -d "%{buildroot}%{_libdir}" -install -d "%{buildroot}%{_includedir}" +make DESTDIR=%{buildroot} install.everything -make \ - DESTDIR=%{buildroot} \ - install.everything - -%fdupes %{buildroot}%{_mandir}/man3 +%fdupes -s %{buildroot}%{_mandir}/man3 # update-alternatives mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/discount-markdown @@ -135,6 +121,7 @@ fi %defattr(-,root,root) %{_includedir}/mkdio.h %{_libdir}/libmarkdown.so +%{_libdir}/pkgconfig/libmarkdown.pc %{_mandir}/man3/*.3%{ext_man} %changelog