pool/discount
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435614 from Publishing

Browse Source 
- Update to version 2.2.1:
  * No changelog provided
- Refresh patches:
  * discount-disable_ldconfig.patch
  * discount-fix-compile-warings.diff

OBS-URL: https://build.opensuse.org/request/show/435614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discount?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2016-11-01 08:58:13 +00:00 committed by Git OBS Bridge
commit e12705ae6e
6 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
discount-2.2.0.tar.bz2
View File

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

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

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

4
discount-disable_ldconfig.patch
View File

@ -2,7 +2,7 @@ Index: configure.inc
=================================================================== ===================================================================
--- configure.inc.orig --- configure.inc.orig
+++ configure.inc +++ 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 if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
USE_SONAME=T USE_SONAME=T
fi fi
@ -10,7 +10,7 @@ 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
@@ -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.\$MAJOR
$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
EOF EOF

10
discount-fix-compile-warings.diff
View File

@ -1,8 +1,8 @@
diff --git a/Makefile.in b/Makefile.in Index: Makefile.in
index 6b88ebf..6d9609f 100644 ===================================================================
--- a/Makefile.in --- Makefile.in.orig
+++ b/Makefile.in +++ Makefile.in
@@ -108,9 +108,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify @@ -113,9 +113,9 @@ test: $(PGMS) $(TESTFRAMEWORK) verify
done done
cols: tools/cols.c config.h cols: tools/cols.c config.h

9
discount.changes
View File

@ -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 Sun May 1 15:29:28 UTC 2016 - mpluskal@suse.com

43
discount.spec
View File

@ -19,7 +19,7 @@
%define soname 2 %define soname 2
%bcond_with fenced_code %bcond_with fenced_code
Name: discount Name: discount
Version: 2.2.0 Version: 2.2.1
Release: 0 Release: 0
Summary: Markdown text to HTML converter Summary: Markdown text to HTML converter
License: BSD-3-Clause 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 Source: http://www.pell.portland.or.us/~orc/Code/discount/discount-%{version}.tar.bz2
Patch1: discount-disable_ldconfig.patch Patch1: discount-disable_ldconfig.patch
Patch2: discount-fix-compile-warings.diff Patch2: discount-fix-compile-warings.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc BuildRequires: pkgconfig
BuildRequires: glibc-devel
BuildRequires: libtool
BuildRequires: make
Requires: libmarkdown%{soname} = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -65,35 +59,27 @@ of Markdown.
%prep %prep
%setup -q %setup -q
%patch1 %patch1
%patch2 -p1 %patch2
%build %build
./configure.sh \ ./configure.sh \
--shared \ --shared \
--prefix="%{_prefix}" \ --prefix="%{_prefix}" \
--execdir="%{_bindir}" \ --execdir="%{_bindir}" \
--confdir="%{_sysconfdir}" \ --confdir="%{_sysconfdir}" \
--libdir="%{_libdir}" \ --libdir="%{_libdir}" \
--mandir="%{_mandir}" \ --mandir="%{_mandir}" \
%if %{with fenced_code} %if %{with fenced_code}
--with-fenced-code \ --with-fenced-code \
%endif %endif
--with-dl=BOTH \ --with-dl=BOTH \
--enable-all-features --enable-all-features
make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
%install %install
install -d "%{buildroot}%{_bindir}" make DESTDIR=%{buildroot} install.everything
install -d "%{buildroot}%{_mandir}"
install -d "%{buildroot}%{_libdir}"
install -d "%{buildroot}%{_includedir}"
make \ %fdupes -s %{buildroot}%{_mandir}/man3
DESTDIR=%{buildroot} \
install.everything
%fdupes %{buildroot}%{_mandir}/man3
# update-alternatives # update-alternatives
mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/discount-markdown mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/discount-markdown
@ -135,6 +121,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/mkdio.h %{_includedir}/mkdio.h
%{_libdir}/libmarkdown.so %{_libdir}/libmarkdown.so
%{_libdir}/pkgconfig/libmarkdown.pc
%{_mandir}/man3/*.3%{ext_man} %{_mandir}/man3/*.3%{ext_man}
%changelog %changelog