1
0

- New package MultiMarkdown-6 based on MultiMarkdown-5

- Enable tests
- Update alernatives handling according to current guidelines

- Fix typo and add more comments

- Use update alternatives to allow parallel installation with discount
- Avoid conflict with mtools

- Update to version 5.4.0:
  * Improve accuracy and performance of strong/emph
  * CHANGED: Update greg
  * 5.3.0
  * CHANGED: Update README
  * ADDED: Move static library options to separate make target
  * FIXED: Fix crash with empty table label
  * ADDED: Add email address to cpack settings (addresses #31)
  * CHANGED: Increase list of syntax structures that are evaluated for abbreviations (Thanks, David!)
  * FIXED: Avoids problem mentioned on github (#30), but doesn't actually solve it. Any help appreciated!
  * version bump 5.4.0

- Update to version 5.3.0:
  * FIXED: Don't allow math spans inside strong/emph
  * FIXED: Fix slow parsing of complex strong/emph (Fixes #18)
  * CHANGED: Update test suite
  * FIXED: Improve performance; FIXED: Fix additional edge case in emph/strong parser
  * Improve accuracy and performance of strong/emph
  * CHANGED: Update greg
  * 5.3.0

OBS-URL: https://build.opensuse.org/package/show/Publishing/MultiMarkdown-6?expand=0&rev=2
This commit is contained in:
Martin Pluskal 2017-10-19 13:46:41 +00:00 committed by Git OBS Bridge
parent 3238c814b6
commit 505dad0067
5 changed files with 26 additions and 23 deletions

View File

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

View File

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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 19 13:37:22 UTC 2017 - mpluskal@suse.com
- New package MultiMarkdown-6 based on MultiMarkdown-5
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 22 14:10:24 UTC 2017 - mpluskal@suse.com Thu Jun 22 14:10:24 UTC 2017 - mpluskal@suse.com

View File

@ -1,5 +1,5 @@
# #
# spec file for package MultiMarkdown-5 # spec file for package MultiMarkdown-6
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
@ -16,8 +16,8 @@
# #
Name: MultiMarkdown-5 Name: MultiMarkdown-6
Version: 5.4.0 Version: 6.2.2
Release: 0 Release: 0
Summary: Reference implementation of MultiMarkdown Summary: Reference implementation of MultiMarkdown
License: MIT License: MIT
@ -27,11 +27,12 @@ Url: http://fletcherpenney.net/multimarkdown
# missing submodules that are necessary for building # missing submodules that are necessary for building
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: xz BuildRequires: texlive-filesystem
Requires: texlive-filesystem
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
MultiMarkdown is a derivative of Markdown that adds new syntax features, MultiMarkdown is a derivative of Markdown that adds new syntax features,
@ -42,12 +43,6 @@ to convert plain text into LaTeX in addition to HTML.
%setup -q %setup -q
%build %build
export CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE"
export CXXLAGS="%{optflags} -fPIE -D_GNU_SOURCE"
# Build will fail when this file is not present - build system will try to
# generate this file using MultiMarkdown which is not yet built
install -D /dev/null build/README.html
make %{?_smp_mflags} XFLAGS="%{optflags}" -C submodules/greg
%cmake %cmake
make %{?_smp_mflags} make %{?_smp_mflags}
@ -61,13 +56,14 @@ mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/%{name}-markdown
install -d %{buildroot}%{_sysconfdir}/alternatives install -d %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/markdown touch %{buildroot}%{_sysconfdir}/alternatives/markdown
ln -sf %{_sysconfdir}/alternatives/markdown %{buildroot}%{_bindir}/markdown ln -sf %{_sysconfdir}/alternatives/markdown %{buildroot}%{_bindir}/markdown
%fdupes %{buildroot}
%check %check
%ctest %ctest
%post %post
update-alternatives \ update-alternatives \
--install %{_bindir}/markdown markdown %{_bindir}/%{name}-markdown 30 --install %{_bindir}/markdown markdown %{_bindir}/%{name}-markdown 40
%postun %postun
if [ ! -f %{_bindir}/%{name}-markdown ] ; then if [ ! -f %{_bindir}/%{name}-markdown ] ; then
@ -75,18 +71,20 @@ if [ ! -f %{_bindir}/%{name}-markdown ] ; then
fi fi
%files %files
%defattr(-,root,root) %doc LICENSE.txt README.md
%doc LICENSE.txt README.md CHANGELOG.md
%ghost %{_sysconfdir}/alternatives/markdown %ghost %{_sysconfdir}/alternatives/markdown
%{_bindir}/markdown %{_bindir}/markdown
%{_bindir}/%{name}-markdown %{_bindir}/%{name}-markdown
%{_bindir}/%{name}-mmd %{_bindir}/%{name}-mmd
%{_bindir}/mmd2all %{_bindir}/mmd2all
%{_bindir}/mmd2odf
%{_bindir}/mmd2opml %{_bindir}/mmd2opml
%{_bindir}/mmd2pdf %{_bindir}/mmd2pdf
%{_bindir}/mmd2rtf
%{_bindir}/mmd2tex %{_bindir}/mmd2tex
%{_bindir}/multimarkdown %{_bindir}/multimarkdown
%{_bindir}/mmd2epub
%{_bindir}/mmd2fodt
%{_bindir}/mmd2odt
%dir %{_datadir}/texmf/tex/latex/mmd6
%{_datadir}/texmf/tex/latex/mmd6/*
%changelog %changelog

View File

@ -1,11 +1,11 @@
<services> <services>
<service mode="disabled" name="tar_scm"> <service mode="disabled" name="tar_scm">
<param name="url">https://github.com/fletcher/MultiMarkdown-5.git</param> <param name="url">https://github.com/fletcher/MultiMarkdown-6.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
<param name="filename">MultiMarkdown-5</param> <param name="filename">MultiMarkdown-6</param>
<param name="versionformat">5.4.0</param> <param name="versionformat">6.2.2</param>
<param name="revision">5.4.0</param> <param name="revision">6.2.2</param>
</service> </service>
<service mode="disabled" name="recompress"> <service mode="disabled" name="recompress">
<param name="file">*.tar</param> <param name="file">*.tar</param>