And we no longer need the placeholders in the Anaconda repo when
the help content sub-package is now always available.
Related: rhbz#1072033
Signed-off-by: Martin Kolman <mkolman(a)redhat.com>
---
anaconda.spec.in | 2 +-
data/help/en-US/FedoraPlaceholder.html | 5 -----
data/help/en-US/FedoraPlaceholderWithLinks.html | 13 -------------
data/help/en-US/Makefile.am | 3 ---
data/help/en-US/RHEL7Placeholder.html | 5 -----
data/help/en-US/RHEL7PlaceholderWithLinks.html | 11 -----------
6 files changed, 1 insertion(+), 38 deletions(-)
delete mode 100644 data/help/en-US/FedoraPlaceholder.html
delete mode 100644 data/help/en-US/FedoraPlaceholderWithLinks.html
delete mode 100644 data/help/en-US/RHEL7Placeholder.html
delete mode 100644 data/help/en-US/RHEL7PlaceholderWithLinks.html
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 2f5dff0..2293662 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -275,7 +275,7 @@ update-desktop-database &> /dev/null || :
%{_sbindir}/anaconda
%{_sbindir}/handle-sshpw
%{_datadir}/anaconda
-%{_datadir}/anaconda/help/*
+%exclude %{_datadir}/anaconda/help/*
%exclude %{_datadir}/anaconda/tzmapdata
%{_prefix}/libexec/anaconda
%{_libdir}/python*/site-packages/pyanaconda/*
diff --git a/data/help/en-US/FedoraPlaceholder.html
b/data/help/en-US/FedoraPlaceholder.html
deleted file mode 100644
index 4d1781a..0000000
--- a/data/help/en-US/FedoraPlaceholder.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other
online help resources instead.</p>
-</body>
diff --git a/data/help/en-US/FedoraPlaceholderWithLinks.html
b/data/help/en-US/FedoraPlaceholderWithLinks.html
deleted file mode 100644
index 5fe0485..0000000
--- a/data/help/en-US/FedoraPlaceholderWithLinks.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Anaconda wiki page, the Fedora Installation Guide or other
online help resources instead:</p>
-<p>
-<ul>
- <li><a
href="http://docs.fedoraproject.org/en-US/Fedora/20/html/Installatio...
Installation Guide</a></li>
- <li><a
href="https://fedoraproject.org/wiki/Anaconda">Anaconda
Wiki</a></li>
- <li><a
href="http://fedoraproject.org/wiki/Anaconda_Boot_Options">A... Boot
Options</a></li>
- <li><a
href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anac...
Kickstart</a></li>
-</ul>
-</p>
-</body>
diff --git a/data/help/en-US/Makefile.am b/data/help/en-US/Makefile.am
index b7aa1bc..3d869fb 100644
--- a/data/help/en-US/Makefile.am
+++ b/data/help/en-US/Makefile.am
@@ -17,7 +17,4 @@
#
# Author: Martin Kolman <mkolman(a)redhat.com>
-enplaceholderdir = $(datadir)/anaconda/help/en-US
-dist_enplaceholder_DATA = FedoraPlaceholder.html FedoraPlaceholderWithLinks.html
RHEL7Placeholder.html RHEL7PlaceholderWithLinks.html
-
MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/help/en-US/RHEL7Placeholder.html
b/data/help/en-US/RHEL7Placeholder.html
deleted file mode 100644
index 9f3c446..0000000
--- a/data/help/en-US/RHEL7Placeholder.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check out the Red Hat Enterprise Linux 7 Installation Guide or other
online help resources instead.</p>
-</body>
diff --git a/data/help/en-US/RHEL7PlaceholderWithLinks.html
b/data/help/en-US/RHEL7PlaceholderWithLinks.html
deleted file mode 100644
index c2da61b..0000000
--- a/data/help/en-US/RHEL7PlaceholderWithLinks.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<body>
-<h1>The Anaconda built-in help</h1>
-<p>...is not yet available for this screen.</p>
-<p>You can check the Red Hat Enterprise Linux 7 Installation Guide or Red Hat
Customer Portal resources instead:</p>
-<p>
-<ul>
- <li><a
href="https://access.redhat.com/documentation/en-US/Red_Hat_Enterpri...
Hat Enterprise Linux 7 Installation Guide</a></li>
- <li><a href="https://access.redhat.com">Red Hat Customer
Portal</a></li>
-</ul>
-</p>
-</body>
--
1.9.3