From 505dad006771822b708548932e9539db26ad55ad5e4fd89f33f335c185eb8c0d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 19 Oct 2017 13:46:41 +0000 Subject: [PATCH] - 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 --- MultiMarkdown-5-5.4.0.tar.xz | 3 -- MultiMarkdown-6-6.2.2.tar.xz | 3 ++ ...kdown-5.changes => MultiMarkdown-6.changes | 5 ++++ MultiMarkdown-5.spec => MultiMarkdown-6.spec | 30 +++++++++---------- _service | 8 ++--- 5 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 MultiMarkdown-5-5.4.0.tar.xz create mode 100644 MultiMarkdown-6-6.2.2.tar.xz rename MultiMarkdown-5.changes => MultiMarkdown-6.changes (94%) rename MultiMarkdown-5.spec => MultiMarkdown-6.spec (79%) diff --git a/MultiMarkdown-5-5.4.0.tar.xz b/MultiMarkdown-5-5.4.0.tar.xz deleted file mode 100644 index 296ac3a..0000000 --- a/MultiMarkdown-5-5.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96db04343872030527b9f306c468b46df12588eded9d95f549d381fffd7966bd -size 524936 diff --git a/MultiMarkdown-6-6.2.2.tar.xz b/MultiMarkdown-6-6.2.2.tar.xz new file mode 100644 index 0000000..2f69a11 --- /dev/null +++ b/MultiMarkdown-6-6.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e246bdfc5bbfcf50943fc7b8c27d988a6c274c5996c8a555c468f0f3bb49115 +size 662508 diff --git a/MultiMarkdown-5.changes b/MultiMarkdown-6.changes similarity index 94% rename from MultiMarkdown-5.changes rename to MultiMarkdown-6.changes index 086ee54..c729c6f 100644 --- a/MultiMarkdown-5.changes +++ b/MultiMarkdown-6.changes @@ -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 diff --git a/MultiMarkdown-5.spec b/MultiMarkdown-6.spec similarity index 79% rename from MultiMarkdown-5.spec rename to MultiMarkdown-6.spec index 9da05e6..647e1f9 100644 --- a/MultiMarkdown-5.spec +++ b/MultiMarkdown-6.spec @@ -1,5 +1,5 @@ # -# spec file for package MultiMarkdown-5 +# spec file for package MultiMarkdown-6 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,8 +16,8 @@ # -Name: MultiMarkdown-5 -Version: 5.4.0 +Name: MultiMarkdown-6 +Version: 6.2.2 Release: 0 Summary: Reference implementation of MultiMarkdown License: MIT @@ -27,11 +27,12 @@ Url: http://fletcherpenney.net/multimarkdown # missing submodules that are necessary for building Source: %{name}-%{version}.tar.xz BuildRequires: cmake +BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: xz +BuildRequires: texlive-filesystem +Requires: texlive-filesystem Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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 %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 make %{?_smp_mflags} @@ -61,13 +56,14 @@ mv %{buildroot}%{_bindir}/markdown %{buildroot}%{_bindir}/%{name}-markdown install -d %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/markdown ln -sf %{_sysconfdir}/alternatives/markdown %{buildroot}%{_bindir}/markdown +%fdupes %{buildroot} %check %ctest %post update-alternatives \ - --install %{_bindir}/markdown markdown %{_bindir}/%{name}-markdown 30 + --install %{_bindir}/markdown markdown %{_bindir}/%{name}-markdown 40 %postun if [ ! -f %{_bindir}/%{name}-markdown ] ; then @@ -75,18 +71,20 @@ if [ ! -f %{_bindir}/%{name}-markdown ] ; then fi %files -%defattr(-,root,root) -%doc LICENSE.txt README.md CHANGELOG.md +%doc LICENSE.txt README.md %ghost %{_sysconfdir}/alternatives/markdown %{_bindir}/markdown %{_bindir}/%{name}-markdown %{_bindir}/%{name}-mmd %{_bindir}/mmd2all -%{_bindir}/mmd2odf %{_bindir}/mmd2opml %{_bindir}/mmd2pdf -%{_bindir}/mmd2rtf %{_bindir}/mmd2tex %{_bindir}/multimarkdown +%{_bindir}/mmd2epub +%{_bindir}/mmd2fodt +%{_bindir}/mmd2odt +%dir %{_datadir}/texmf/tex/latex/mmd6 +%{_datadir}/texmf/tex/latex/mmd6/* %changelog diff --git a/_service b/_service index cf95d62..0e77f37 100644 --- a/_service +++ b/_service @@ -1,11 +1,11 @@ - https://github.com/fletcher/MultiMarkdown-5.git + https://github.com/fletcher/MultiMarkdown-6.git git enable - MultiMarkdown-5 - 5.4.0 - 5.4.0 + MultiMarkdown-6 + 6.2.2 + 6.2.2 *.tar