From 83fdb77efd59d95fef43af936cd423fd0fe9da27 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Mon, 31 Mar 2008 18:46:45 +0000
Subject: [PATCH] Add forgotten file

---
 highlight-2.6.9-makefile.patch | 65 ++++++++++++++++++++++++++++++++++
 highlight.spec                 |  4 +--
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 highlight-2.6.9-makefile.patch

diff --git a/highlight-2.6.9-makefile.patch b/highlight-2.6.9-makefile.patch
new file mode 100644
index 0000000..2252c51
--- /dev/null
+++ b/highlight-2.6.9-makefile.patch
@@ -0,0 +1,65 @@
+diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
+--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
++++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
+@@ -25,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+ examples_dir = ${PREFIX}/share/doc/highlight/examples/
+ 
+ # Location of the highlight config files:
+-conf_dir = ${PREFIX}/etc/highlight/
++conf_dir = /etc/highlight/
+ 
+ # Commands:
+ INSTALL_DATA=install -m644
+@@ -51,21 +51,12 @@ all-gui-wx29:
+ install:
+ 	@echo "This script will install highlight in the following directories:"
+ 	@echo "Data directory:	        ${DESTDIR}${data_dir}"
+-	@echo "Documentation directory: ${DESTDIR}${doc_dir}"
+-	@echo "Examples directory:      ${DESTDIR}${examples_dir}"
+ 	@echo "Manual directory:        ${DESTDIR}${man_dir}"
+ 	@echo "Binary directory:        ${DESTDIR}${bin_dir}"
+ 	@echo "Configuration directory: ${DESTDIR}${conf_dir}"
+ 	@echo
+ 
+-	${MKDIR} ${DESTDIR}${doc_dir}
+ 	${MKDIR} ${DESTDIR}${conf_dir}
+-	${MKDIR} ${DESTDIR}${examples_dir} \
+-		${DESTDIR}${examples_dir}plugins \
+-		${DESTDIR}${examples_dir}plugins/dokuwiki \
+-		${DESTDIR}${examples_dir}plugins/movabletype \
+-		${DESTDIR}${examples_dir}plugins/wordpress \
+-		${DESTDIR}${examples_dir}swig
+ 	${MKDIR} ${DESTDIR}${data_dir} \
+ 		${DESTDIR}${data_dir}themes \
+ 		${DESTDIR}${data_dir}langDefs \
+@@ -80,22 +71,6 @@ install:
+ 	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
+ 	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
+ 	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
+-	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
+-	${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
+-	${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
+-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
+-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
+-	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
+-	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
+ 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
+ 
+ 	@echo
+@@ -121,7 +96,6 @@ install-gui:
+ uninstall:
+ 	@echo "Removing highlight files from system..."
+ 	${RMDIR} ${DESTDIR}${data_dir}
+-	${RMDIR} ${DESTDIR}${doc_dir}
+ 	${RMDIR} ${DESTDIR}${conf_dir}
+ 	${RMDIR} ${DESTDIR}${examples_dir}
+ 	rm ${DESTDIR}${man_dir}highlight.1.gz
diff --git a/highlight.spec b/highlight.spec
index 07ca8fb..b4b8a52 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.6.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
-* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.9-1
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.9-2
 - New upstream release
 
 * Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.8-1