[fawkes/el5/master] Update desktop files patch, BR graphviz, CentOS/RHEL 5
Tim Niemueller
timn at fedoraproject.org
Sat Nov 6 05:19:31 UTC 2010
commit 48c616b53597f4c2b9925c8a3a3b6bbe298ad779
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Sat Nov 6 01:19:16 2010 -0400
Update desktop files patch, BR graphviz, CentOS/RHEL 5
fawkes-0.4-man-pages.patch | 49 +++++++++++++++++++++++++++++++++++--------
fawkes.spec | 6 +++-
2 files changed, 44 insertions(+), 11 deletions(-)
---
diff --git a/fawkes-0.4-man-pages.patch b/fawkes-0.4-man-pages.patch
index 3118616..e232abf 100644
--- a/fawkes-0.4-man-pages.patch
+++ b/fawkes-0.4-man-pages.patch
@@ -1,7 +1,7 @@
From e87b9b6de48920545567d5e952c9ddfe06ffaf48 Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Sun, 31 Oct 2010 00:58:03 -0400
-Subject: [PATCH 1/9] BuildSys: add support for generating man pages
+Subject: [PATCH 01/10] BuildSys: add support for generating man pages
Fawkes is lacking user documentation. To improve this support for
creating man pages has been added. It uses asciidoc to do so, which has
@@ -239,7 +239,7 @@ index 904652a..9bcbc24 100644
From 6e03b4798a5d36e22eb614d671525810f32baabd Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Sun, 31 Oct 2010 01:00:22 -0400
-Subject: [PATCH 2/9] BuildSys: support system-wide installation of man pages
+Subject: [PATCH 02/10] BuildSys: support system-wide installation of man pages
---
etc/buildsys/btypes/config_sysinstall.mk | 3 ++-
@@ -318,7 +318,7 @@ index 97a4274..0836104 100644
From 9a0a3b8e0a4279d7b91f74d40fcffe498b0e1200 Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Sun, 31 Oct 2010 01:00:54 -0400
-Subject: [PATCH 3/9] Main app: add man page for fawkes
+Subject: [PATCH 03/10] Main app: add man page for fawkes
Added the first man page. It will need further improvements, but it is
at least a start.
@@ -479,7 +479,7 @@ index 0000000..8373447
From 72ce61066f169556498e9cf4042e4ec24e5efa12 Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Tue, 2 Nov 2010 23:32:34 -0400
-Subject: [PATCH 4/9] BuildSys/Interfaces: build generator as presubdir
+Subject: [PATCH 04/10] BuildSys/Interfaces: build generator as presubdir
We had a special case for the interface generator that included a
Makefile snippet either in the generator dir or its parent interfaces
@@ -688,7 +688,7 @@ index 3394022..0000000
From 42e12471844c5d993fcc6431a6356160b36735da Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Wed, 3 Nov 2010 00:11:19 -0400
-Subject: [PATCH 5/9] ffifacegen: Added man page, handle -h arg better
+Subject: [PATCH 05/10] ffifacegen: Added man page, handle -h arg better
---
src/interfaces/generator/Makefile | 1 +
@@ -918,7 +918,7 @@ index ebcae6b..d19cf6c 100644
From 4ab679f56752c3ac96f92977af6e119d26b9330a Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Wed, 3 Nov 2010 00:12:07 -0400
-Subject: [PATCH 6/9] BuildSys: print error messages on man page generation
+Subject: [PATCH 06/10] BuildSys: print error messages on man page generation
Messages generated during man page generation were suppressed to avoid
the "Note: Writing ..." message. This is not helpful on errors though.
@@ -956,7 +956,7 @@ index 9bcbc24..3bfa793 100644
From c446a6f005827882bedc61018c61f2845f947f0a Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Wed, 3 Nov 2010 00:13:36 -0400
-Subject: [PATCH 7/9] Tools: added man pages
+Subject: [PATCH 07/10] Tools: added man pages
---
src/tools/config/Makefile | 8 ++--
@@ -1381,7 +1381,7 @@ index 0000000..0ada348
From afa11306894b79da40c48e550182444895d85ace Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Fri, 5 Nov 2010 23:01:26 -0400
-Subject: [PATCH 8/9] BuildSys man pages: CentOS fix, allow missing asciidoc
+Subject: [PATCH 08/10] BuildSys man pages: CentOS fix, allow missing asciidoc
+ mktemp was called with a flag not available on CentOS/RHEL
+ If asciidoc is not installed, just report that the man page was not
@@ -1446,7 +1446,7 @@ index 3bfa793..58c4af8 100644
From e62652f950177d4c21d05a5b2a770cebab53d2eb Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Sat, 6 Nov 2010 00:21:06 -0400
-Subject: [PATCH 9/9] FireVision tools: add man pages, fix usage info
+Subject: [PATCH 09/10] FireVision tools: add man pages, fix usage info
---
src/firevision/tools/Makefile | 24 +++---
@@ -2324,3 +2324,34 @@ index 763eecb..de72c70 100644
--
1.7.2.3
+
+From 64c7ab3cb9e14ae4dc1172da9dde4015cae1879a Mon Sep 17 00:00:00 2001
+From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
+Date: Sat, 6 Nov 2010 01:17:20 -0400
+Subject: [PATCH 10/10] BuildSys/man pages: asciidoc call compat to CentOS/RHEL 5
+
+---
+ etc/buildsys/rules.mk | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/etc/buildsys/rules.mk b/etc/buildsys/rules.mk
+index 58c4af8..6850312 100644
+--- a/etc/buildsys/rules.mk
++++ b/etc/buildsys/rules.mk
+@@ -183,10 +183,10 @@ $(foreach MS,$(MANPAGE_SECTIONS),$(MANDIR)/man$(MS)/%.$(MS)): %.txt
+ $(SILENT)if type -P $(ASCIIDOC_A2X) >/dev/null 2>&1; then \
+ echo -e "$(INDENT_PRINT)=== Generating man page for $(TBOLDGREEN)$*$(TNORMAL) ---"; \
+ TEMPFILE=$$(mktemp -t fawkes_manpage_$*_XXXXXXXXXX); \
+- $(ASCIIDOC_A2X) -afawkes_version='$(FAWKES_VERSION)' \
+- --asciidoc-opts='-f $(BASEDIR)/doc/asciidoc.conf' -f manpage \
++ $(ASCIIDOC_A2X) -f manpage \
++ --asciidoc-opts='-f $(BASEDIR)/doc/asciidoc.conf -afawkes_version="$(FAWKES_VERSION)"' \
+ -D $(@D) $< >$$TEMPFILE 2>&1; \
+- if egrep -v '^Note: Writing $(@F)$$' $$TEMPFILE >/dev/null 2>&1; then \
++ if egrep -v '^\(Note: Writing $(@F)|Writing $(@F) for refentry\)$$' $$TEMPFILE >/dev/null 2>&1; then \
+ cat $$TEMPFILE; \
+ fi; \
+ rm $$TEMPFILE; \
+--
+1.7.2.3
+
diff --git a/fawkes.spec b/fawkes.spec
index 3b71d30..6edb6b7 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -22,7 +22,7 @@ BuildRequires: libkni3-devel >= 3.9
BuildRequires: libmicrohttpd-devel >= 0.4
BuildRequires: flite-devel
BuildRequires: glibmm24-devel, gtkmm24-devel, cairomm, gconfmm26-devel, libglademm24-devel >= 2.6
-BuildRequires: doxygen, asciidoc
+BuildRequires: doxygen, asciidoc, graphviz, docbook-style-xsl
BuildRequires: desktop-file-utils
BuildRequires: urg-devel >= 0.8
%if ! 0%{?rhel} || 0%{?rhel} >= 6
@@ -89,7 +89,7 @@ Requires: libdc1394-devel >= 2.0, libjpeg-devel >= 6b, libpng-devel >= 1.2
Requires: libkni3-devel >= 3.9
Requires: libmicrohttpd-devel >= 0.4
Requires: glibmm24-devel, gtkmm24-devel, cairomm, gconfmm26-devel, libglademm24-devel >= 2.6
-Requires: doxygen, asciidoc
+Requires: doxygen, asciidoc, graphviz, docbook-style-xsl
Requires: urg-devel >= 0.8
Requires: readline-devel >= 5.1
# only on fedora and el6+
@@ -561,6 +561,8 @@ rm -rf %{buildroot}
* Fri Nov 05 2010 Tim Niemueller <tim at niemueller.de> - 0.4-4
- EL 5/6 compatibility, omit stuff with unfulfilled dependencies
- Update man pages patch for EL 5/6 and more man pages
+- Update desktop files patch for EL 5/6
+- BuildRequire graphviz docbook-style-xsl for proper documentation generation
* Thu Nov 04 2010 Tim Niemueller <tim at niemueller.de> - 0.4-3
- consistent macro usage
More information about the scm-commits
mailing list