[PATCH] Use the anaconda-user-help package for help content

Martin Kolman mkolman at redhat.com
Tue Dec 16 17:24:44 UTC 2014


Also remove the previous makefile based help content packaging code and
the help placeholders, which have been moved to the Installation Guide repository.

Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 Makefile.am                                     | 29 +++----------------------
 anaconda.spec.in                                |  3 ++-
 data/help/en-US/FedoraPlaceholder.html          |  5 -----
 data/help/en-US/FedoraPlaceholderWithLinks.html | 13 -----------
 data/help/en-US/Makefile.am                     |  6 -----
 data/help/en-US/RHEL7Placeholder.html           |  5 -----
 data/help/en-US/RHEL7PlaceholderWithLinks.html  | 11 ----------
 7 files changed, 5 insertions(+), 67 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/Makefile.am b/Makefile.am
index 9b9f6b1..7f7478b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,8 +47,6 @@ ARCHIVE_TAG   = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
 TX_PULL_ARGS = -a -f
 TX_PUSH_ARGS = -s
 
-INSTALLATION_GUIDE_REPO_URL = git://git.fedorahosted.org/git/docs/install-guide.git
-
 tag:
 	@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
 	@echo "Tagged as $(ARCHIVE_TAG)"
@@ -64,11 +62,11 @@ po-empty:
 		exit 1 ; \
 	done
 
-scratch: po-empty get-help
+scratch: po-empty
 	$(MAKE) ARCHIVE_TAG=HEAD dist
 	git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot
 
-scratch-bumpver: po-empty get-help
+scratch-bumpver: po-empty
 	@opts="-S -n $(PACKAGE_NAME) -v $(PACKAGE_VERSION) -r $(PACKAGE_RELEASE) -b $(PACKAGE_BUGREPORT)" ; \
 	if [ ! -z "$(IGNORE)" ]; then \
 		opts="$${opts} -i $(IGNORE)" ; \
@@ -82,7 +80,7 @@ scratch-bumpver: po-empty get-help
 	( cd $(srcdir) && scripts/makebumpver --skip-tx $${opts} ) || exit 1 ; \
 	$(MAKE) -C po $(PACKAGE_NAME).pot-update ;
 
-release: get-help
+release:
 	$(MAKE) dist && $(MAKE) tag && git checkout -- $(srcdir)/po/$(PACKAGE_NAME).pot
 
 bumpver: po-pull
@@ -147,24 +145,3 @@ runglade:
 	GLADE_CATALOG_SEARCH_PATH=$(srcdir)/widgets/glade \
 	GLADE_MODULE_SEARCH_PATH=$(builddir)/widgets/src/.libs \
 	glade ${GLADE_FILE}
-
-
-# Get content for the Anaconda built-in help system by cloning the
-# installation guide git repository and running the help processing
-# script (it is part of the repository).
-# Once the help content has been generated copy it to our help folder,
-# so that it can be included in the tarball.
-# Skip the git clone if the repository already exists but run git pull
-# to make sure it is up to date. We also clone the repository
-# without history as it si rather big (>400 MB!), which is quite
-# an overkill for <100 kB of help conent. :)
-get-help:
-	if [ ! -d "install-guide" ]; then \
-		if [ -f "installation_guide_repo_url" ]; then \
-			git clone --depth=1 `cat installation_guide_repo_url` ; \
-	    else \
-			git clone --depth=1 $(INSTALLATION_GUIDE_REPO_URL) ; \
-		fi ; \
-	fi ; \
-	( cd install-guide && git pull --rebase && python prepare_anaconda_help_content.py )
-	cp -r install-guide/anaconda_help_content/* $(srcdir)/data/help
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 75a919f..b5d048a 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -44,6 +44,7 @@ Source0: %{name}-%{version}.tar.bz2
 %define langtablever 0.0.18-1
 %define libxklavierver 5.4
 %define libtimezonemapver 0.4.1-2
+%define helpver 22.1-1
 
 BuildRequires: audit-libs-devel
 BuildRequires: gettext >= %{gettextver}
@@ -175,6 +176,7 @@ Requires: keybinder3
 %ifnarch s390 s390x
 Requires: NetworkManager-wifi
 %endif
+Requires: anaconda-user-help >= %{helpver}
 Requires: yelp
 
 %description gui
@@ -265,7 +267,6 @@ update-desktop-database &> /dev/null || :
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
-%{_datadir}/anaconda/help/*
 %{_prefix}/libexec/anaconda
 %{_libdir}/python*/site-packages/pyanaconda/*
 %exclude %{_libdir}/python*/site-packages/pyanaconda/rescue.py*
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/Installation_Guide/">Fedora 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">Anaconda Boot Options</a></li>
-    <li><a href="http://fedoraproject.org/wiki/Anaconda/Kickstart">Anaconda Kickstart</a></li>
-</ul>
-</p>
-</body>
diff --git a/data/help/en-US/Makefile.am b/data/help/en-US/Makefile.am
index 46590cb..3d869fb 100644
--- a/data/help/en-US/Makefile.am
+++ b/data/help/en-US/Makefile.am
@@ -17,10 +17,4 @@
 #
 # Author: Martin Kolman <mkolman at redhat.com>
 
-enhelpcontentdir              = $(datadir)/anaconda/help/en-US
-# The $(srcdir)/*.*ml expression matches both the *.html placeholders and *.xml help
-# content files. It also works around the fact that autotools complain if the xml files
-# are not present but $(srcdir)/*.xml is used.
-dist_enhelpcontent_DATA       = $(srcdir)/*.*ml
-
 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_Enterprise_Linux/7/html/Installation_Guide/index.html">Red 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



More information about the anaconda-patches mailing list