From 8eee7d9a4b0f49418eff69ae2f07df542d703bab6cfda0d0ad10b8ae63176528 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 3 Nov 2017 09:25:29 +0000 Subject: [PATCH] - Conflict with MultiMarkdown-5 - Provide virtual package markdown OBS-URL: https://build.opensuse.org/package/show/Publishing/MultiMarkdown-6?expand=0&rev=3 --- MultiMarkdown-6.changes | 6 ++++++ MultiMarkdown-6.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MultiMarkdown-6.changes b/MultiMarkdown-6.changes index c729c6f..65b25b8 100644 --- a/MultiMarkdown-6.changes +++ b/MultiMarkdown-6.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 3 09:25:51 UTC 2017 - mpluskal@suse.com + +- Conflict with MultiMarkdown-5 +- Provide virtual package markdown + ------------------------------------------------------------------- Thu Oct 19 13:37:22 UTC 2017 - mpluskal@suse.com diff --git a/MultiMarkdown-6.spec b/MultiMarkdown-6.spec index 647e1f9..14947a4 100644 --- a/MultiMarkdown-6.spec +++ b/MultiMarkdown-6.spec @@ -30,6 +30,8 @@ BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: texlive-filesystem +Conflicts: MultiMarkdown-5 +Provides: markdown Requires: texlive-filesystem Requires(post): update-alternatives Requires(postun): update-alternatives @@ -44,7 +46,7 @@ to convert plain text into LaTeX in addition to HTML. %build %cmake -make %{?_smp_mflags} +%make_jobs %install %cmake_install