[websec] Fix #660818 (FTBS)
Thorsten Leemhuis
thl at fedoraproject.org
Wed Jun 22 20:57:13 UTC 2011
commit 58b4fea45a768283837f7a4116754cfb1681faa5
Author: Thorsten Leemhuis <fedora at leemhuis.info>
Date: Wed Jun 22 22:54:17 2011 +0200
Fix #660818 (FTBS)
- Add a patch that removes some usused HTML procssing bit from the Makefile
that seem to confuse newer make versions; fixes #660818 (FTBS)
websec-disable-htmldocs | 23 +++++++++++++++++++++++
websec.spec | 11 ++++++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/websec-disable-htmldocs b/websec-disable-htmldocs
new file mode 100644
index 0000000..f622f56
--- /dev/null
+++ b/websec-disable-htmldocs
@@ -0,0 +1,23 @@
+#
+# newer GNU Make versions (3.82, maybe older) get confused by something in this
+# area; we never installed the HTML docs anyway, so simply remove the section
+#
+diff -Naru websec-1.9.0.org/Makefile websec-1.9.0/Makefile
+--- websec-1.9.0.org/Makefile 2003-05-18 09:37:00.000000000 +0200
++++ websec-1.9.0/Makefile 2011-06-22 18:54:11.674124020 +0200
+@@ -55,15 +55,3 @@
+
+ $(CONFMAN) : %.5 : %
+ pod2man --section 5 $< > $@
+-
+-install_html: html
+- install -m 0644 $(HTMLFILES) $(DEST)
+-
+-html: $(CONFMANHTML) $(PROGMANHTML)
+-
+-$(CONFMANHTML) : %(5).html : %
+- pod2html --htmlroot . --podroot . --podpath . --infile "$<" --outfile "$@"
+-
+-$(PROGMANHTML) : %(1).html : %
+- -rm -f pod2htm*
+- pod2html --htmlroot . --podroot . --podpath . --infile "$<" --outfile "$@"
diff --git a/websec.spec b/websec.spec
index e596268..7c3e110 100644
--- a/websec.spec
+++ b/websec.spec
@@ -1,12 +1,16 @@
Name: websec
Version: 1.9.0
-Release: 8.1
+Release: 9.1
Summary: Web Secretary - Web page monitoring software with highlighting
Group: Applications/Internet
License: GPLv2+
URL: http://baruch.ev-en.org/proj/websec/
Source0: http://baruch.ev-en.org/proj/websec/websec-1.9.0.tar.gz
+# Patch0: newer GNU Make versions (3.82, maybe older as well) get confused by
+# parts of the Makefile that are unused anyway, so remove them with this patch;
+# upstream is dead afaics
+Patch0: %{name}-disable-htmldocs
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -24,6 +28,7 @@ load the highlighted page in a browser.
%prep
%setup -q
+%patch0 -p1 -b .patch0
%build
@@ -62,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 22 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.9.0-9.1
+- Add a patch that removes some usused HTML procssing bit from the Makefile
+ that seem to confuse newer make versions; fixes #660818 (FTBS)
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-8.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list