Update multimarkdown.

2 files changed, 53 insertions, 7 deletions

diff --git a/multimarkdown/fsf-address.patch b/multimarkdown/fsf-address.patch
new file mode 100644
index 0000000..d5906fb
--- /dev/null
+++ b/multimarkdown/fsf-address.patch
@@ -0,0 +1,30 @@
+diff --git a/texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty b/texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty
+index a2e633f..64c816e 100644
+--- a/texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty
++++ b/texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty
+@@ -23,8 +23,8 @@
+ % You should have received a copy of the GNU General Public License
+ % along with this program; if not, write to the
+ %    Free Software Foundation, Inc.
+-%    59 Temple Place, Suite 330
+-%    Boston, MA 02111-1307 USA
++%    51 Franklin Street, Fifth Floor
++%    Boston, MA 02110-1301 USA
+ 
+ 
+ \ProvidesPackage{mmd-envelope}
+diff --git a/texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty b/texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty
+index 889e796..ec399ed 100644
+--- a/texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty
++++ b/texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty
+@@ -23,8 +23,8 @@
+ % You should have received a copy of the GNU General Public License
+ % along with this program; if not, write to the
+ %    Free Software Foundation, Inc.
+-%    59 Temple Place, Suite 330
+-%    Boston, MA 02111-1307 USA
++%    51 Franklin Street, Fifth Floor
++%    Boston, MA 02110-1301 USA
+ 
+ 
+ \ProvidesPackage{mmd-letterhead}
diff --git a/multimarkdown/multimarkdown.spec b/multimarkdown/multimarkdown.spec
index 75c721b..9e0a3ff 100644
--- a/multimarkdown/multimarkdown.spec
+++ b/multimarkdown/multimarkdown.spec
@@ -2,13 +2,17 @@
 
 Name:           multimarkdown
 Version:        6.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight markup processor to produce HTML, LaTeX, and more
 
-License:        MIT and GPLv2 and BSD and zlib
+# MultiMarkdown 6 is licensed under MIT, licenses of bundled software is next to the bundling declaration
+License:        MIT and ((MIT and GPLv2) and zlib and BSD and MIT and BSD)
 URL:            https://fletcher.github.io/%{projectname}/
 Source0:        https://github.com/fletcher/%{projectname}/archive/%{version}/%{projectname}-%{version}.tar.gz
 
+# https://github.com/fletcher/MultiMarkdown-6/pull/184
+Patch0:         fsf-address.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  make
@@ -16,13 +20,21 @@ BuildRequires:  perl
 
 # Upstream choosed not to unbundle these:
 # https://github.com/fletcher/MultiMarkdown-6/issues/180#issuecomment-584335760
+
+# Both MIT and GPLv2 (d_string.c and d_string.h)
+Provides:       bundled(multimarkdown) = 4.7.1
+
+# The zlib/libpng License
 Provides:       bundled(CuTest)
+
+# The Revised BSD License
 Provides:       bundled(argtable3)
+
+# The MIT License
 Provides:       bundled(miniz)
-Provides:       bundled(uthash)
 
-# d_string.c and d_string.h
-Provides:       bundled(multimarkdown) = 4.7.1
+# The Revised BSD License
+Provides:       bundled(uthash)
 
 %description
 MultiMarkdown is a superset of the Markdown lightweight markup syntax with
@@ -38,7 +50,7 @@ you don’t have to write in “computer-ese” to create well formatted HTML or
 commands. You just write, MultiMarkdown takes care of the rest.
 
 %prep
-%autosetup      -n %{projectname}-%{version}
+%autosetup      -n %{projectname}-%{version} -S git
 
 %build
 cd build
@@ -65,9 +77,13 @@ ctest -V %{?_smp_mflags}
 %{_datadir}/texmf/tex/latex/mmd6
 
 %changelog
+* Mon Feb 10 2020 Lyes Saadi <fedora@lyes.eu> - 6.5.1-4
+- Patching FSF address.
+- Documenting the licensing breakdown. 
+
 * Mon Feb 10 2020 Lyes Saadi <fedora@lyes.eu> - 6.5.1-3
 - https://github.com/fletcher/MultiMarkdown-6/issues/180 :
-- Renaming the package from MultiMarkdown-6 -> multimarkdown
+- Renaming the package from MultiMarkdown-6 -> multimarkdown.
 
 * Thu Feb 06 2020 Lyes Saadi <fedora@lyes.eu> - 6.5.1-2
 - Fixing tests.