Add pre-built user documentation to the doc package

.gitignore

@@ -1 +1,2 @@
 /AusweisApp2-*.tar.gz
+/AusweisApp2-*.tar.xz

AusweisApp2.spec

@@ -27,14 +27,16 @@ fipshmac -d "$fipsdir" "$bindir/%{name}"     \
 
 Name:             AusweisApp2
 Version:          1.14.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          %{pkg_sum}
 
 License:          EUPL 1.2
 URL:              https://www.ausweisapp.bund.de/en
 Source0000:       %{forgeurl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source0001:       %{name}.metainfo.xml
-Source0002:       https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%%20EN.txt#/EUPL-12_EN.txt
+Source0001:       %{name}-%{version}-notes_html.tar.xz
+Source0002:       %{name}-%{version}-sdk_html.tar.xz
+Source0003:       %{name}.metainfo.xml
+Source0004:       https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%%20EN.txt#/EUPL-12_EN.txt
 
 # Upstreamed.
 Patch00001:       %{forgeurl}/pull/28.patch#/%{name}-1.14.3-doxygen_exclude_build_dir.patch
@@ -75,10 +77,6 @@ Provides:         %{lc_name}%{?_isa} = %{version}-%{release}
 
 Requires:         %{name}-data       = %{version}-%{release}
 
-%if %{without doxy}
-Obsoletes:        %{name}-doc        < %{version}-%{release}
-%endif
-
 %description
 The AusweisApp2 is a software to identify yourself online
 with your ID card (Personalausweis) or your electronic
@@ -101,27 +99,25 @@ This package contains the architecture-independent files
 used by %{name}.
 
 
-%if %{with doxy}
-# This package must be arched, as the doxygen API documentation
-# differs between architectures.
 %package doc
-Summary:          API-documentation for %{name}
+Summary:          User and API-documentation for %{name}
 BuildArch:        noarch
 
+%if %{with doxy}
 BuildRequires:    doxygen
 BuildRequires:    graphviz
+%endif
 BuildRequires:    hardlink
 
 Requires:         %{name}            = %{version}-%{release}
 
 %description doc
-This package contains the API-documentation for %{name}.
-%endif
+This package contains the User and API-documentation for %{name}.
 
 
 %prep
 %autosetup -p 1
-install -pm 0644 %{SOURCE2} LICENSE.en.txt
+install -pm 0644 %{SOURCE4} LICENSE.en.txt
 
 
 %build
@@ -165,7 +161,7 @@ install -pm 0644 resources/images/npa.svg \
 
 # Install the metainfo.xml file.
 mkdir -p %{buildroot}%{_metainfodir}
-install -pm 0644 %{SOURCE1} %{buildroot}%{_metainfodir}
+install -pm 0644 %{SOURCE3} %{buildroot}%{_metainfodir}
 
 # Generate man-page.
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -178,17 +174,19 @@ help2man                                              \
   %{buildroot}%{_bindir}/%{name}
 
 # Excessive docs.
-mkdir -p %{buildroot}%{_pkgdocdir}/doxy
+mkdir -p %{buildroot}%{_pkgdocdir}/notes \
+  %{buildroot}%{_pkgdocdir}/sdk
 cp -p README.rst %{buildroot}%{_pkgdocdir}
 %if %{with doxy}
+mkdir -p %{buildroot}%{_pkgdocdir}/doxy
 cp -a %{_vpath_builddir}/doc/html/* %{buildroot}%{_pkgdocdir}/doxy
+%endif
+tar xf %{SOURCE1} -C %{buildroot}%{_pkgdocdir}/notes
+tar xf %{SOURCE2} -C %{buildroot}%{_pkgdocdir}/sdk
 find %{buildroot}%{_pkgdocdir} -type d -print0 | xargs -0 chmod -c 0755
 find %{buildroot}%{_pkgdocdir} -type f -print0 | xargs -0 chmod -c 0644
 find %{buildroot}%{_pkgdocdir} -type f -name '.*' -delete -print
 hardlink -cfv %{buildroot}%{_pkgdocdir}
-%else
-rm -fr %{buildroot}%{_pkgdocdir}/doxy
-%endif
 
 # Find translation files.
 %find_lang %{lc_name} --with-qt
@@ -233,12 +231,13 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 
-%if %{with doxy}
 %files doc
-%doc %{_pkgdocdir}/doxy
-%endif
+%doc %{_pkgdocdir}
 
 
 %changelog
+* Tue Aug 25 2020 Björn Esser <besser82@fedoraproject.org> - 1.14.3-2
+- Add pre-built user documentation to the doc package
+
 * Thu Aug 20 2020 Björn Esser <besser82@fedoraproject.org> - 1.14.3-1
 - Initial import (#1851205)

sources

@@ -1 +1,3 @@
 SHA512 (AusweisApp2-1.14.3.tar.gz) = 2217fc454fe875b3e4d405aa24075f35e1b1a6725d25ca5317370ae78e8d68c8b8e562bff0565c0d50860980e8d01d2b880ee05f557112b13f2899cb800e2279
+SHA512 (AusweisApp2-1.14.3-notes_html.tar.xz) = 36d4268b95a357a03c61092744e6aa81ecee97f0246349f129583ac5cc13ac0377aec85b9a71b8b8ef083e0ac6bc4c7576de2629e9e836c580bd122dbdcd9a40
+SHA512 (AusweisApp2-1.14.3-sdk_html.tar.xz) = f8fc1af5e6a3685293b8e3d5b20ff9eb7cb51e77c68d86f351b0c1585e15b92f3af810211a4c30354d509295057d25c2bc084501d3a7c8ce43138141a9f1ccdf