From b2008fb0deb1b0b861df708d22f7fc2890a602ab Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Aug 21 2020 19:37:04 +0000
Subject: Merge doc-api package with the doc package


The Doxygen API documentation can be shipped noarch'ed as well now

---

diff --git a/AusweisApp2.spec b/AusweisApp2.spec
index 16dbd05..3fd59c8 100644
--- a/AusweisApp2.spec
+++ b/AusweisApp2.spec
@@ -74,9 +74,8 @@ Provides:         %{lc_name}               = %{version}-%{release}
 Provides:         %{lc_name}%{?_isa}       = %{version}-%{release}
 
 # Do not raise conflicts about shared license files.
-Requires:         (%{name}-doc             = %{version}-%{release} if %{name}-doc)
-Requires:         (%{name}-doc-api%{?_isa} = %{version}-%{release} if %{name}-doc-api)
-Requires:         %{name}-data             = %{version}-%{release}
+Requires:         %{name}-data       = %{version}-%{release}
+Requires:         (%{name}-doc       = %{version}-%{release} if %{name}-doc)
 
 %description
 The AusweisApp2 is a software to identify yourself online
@@ -101,41 +100,27 @@ used by %{name}.
 
 
 %package doc
-Summary:          User-documentation for %{name}
+Summary:          User and API documentation for %{name}
 BuildArch:        noarch
 
+%if %{with doxy}
+BuildRequires:    doxygen
+BuildRequires:    graphviz
+%endif
 BuildRequires:    hardlink
 BuildRequires:    python3-sphinx
 BuildRequires:    python3-sphinx_rtd_theme
 
 # Do not raise conflicts about shared license files.
-Requires:         (%{name}         = %{version}-%{release} if %{name})
-%if %{with doxy}
-Requires:         (%{name}-doc-api = %{version}-%{release} if %{name}-doc-api)
-%else
-Obsoletes:        %{name}-doc-api  < %{version}-%{release}
-%endif
-
-%description doc
-This package contains the User-documentation for %{name}.
-
-
-%if %{with doxy}
-# This package must be arched, as the doxygen API documentation
-# differs between architectures.
-%package doc-api
-Summary:          API-documentation for %{name}
+Requires:         (%{name}           = %{version}-%{release} if %{name})
 
-BuildRequires:    doxygen
-BuildRequires:    graphviz
-BuildRequires:    hardlink
+# The doc-api package is faded, since we can ship the
+# Doxygen documentation noarch'ed as well now.
+Obsoletes:        %{name}-doc-api    < 1.20.1-2
+Provides:         %{name}-doc-api    = %{version}-%{release}
 
-Requires:         (%{name}%{?_isa} = %{version}-%{release} if %{name})
-Requires:         %{name}-doc      = %{version}-%{release}
-
-%description doc-api
-This package contains the API-documentation for %{name}.
-%endif
+%description doc
+This package contains the user and API documentation for %{name}.
 
 
 %prep
@@ -234,24 +219,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 
 %files doc
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/README.rst
-%doc %{_pkgdocdir}/installation
-%doc %{_pkgdocdir}/integration
-%doc %{_pkgdocdir}/notes
-%doc %{_pkgdocdir}/sdk
+%doc %{_pkgdocdir}
 %license %{_licensedir}/%{name}*
 
 
-%if %{with doxy}
-%files doc-api
-%doc %{_pkgdocdir}/doxy
-%endif
-
-
 %changelog
 * Fri Aug 21 2020 Björn Esser <besser82@fedoraproject.org> - 1.20.1-2
 - Add a patch to exclude the build directory in the Doxyfile
+- Merge doc-api package with the doc package, since the Doxygen
+  API documentation can be shipped noarch'ed as well now
 
 * Wed Aug 19 2020 Björn Esser <besser82@fedoraproject.org> - 1.20.1-1
 - Initial import (#1851205)