rpms/highlight/FC-4 highlight-2.4-makefile.patch, 1.1, 1.2 highlight.spec, 1.3, 1.4

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7603

Modified Files:
	highlight-2.4-makefile.patch highlight.spec 
Log Message:

  Description:
    Fix: Forgotten update makefile.patch file.


highlight-2.4-makefile.patch:

Index: highlight-2.4-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/highlight-2.4-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- highlight-2.4-makefile.patch	4 Aug 2005 15:38:30 -0000	1.1
+++ highlight-2.4-makefile.patch	10 Aug 2005 19:09:47 -0000	1.2
@@ -1,5 +1,5 @@
 --- highlight-2.4-1/makefile.org	2005-07-19 11:27:46.000000000 +0200
-+++ highlight-2.4-1/makefile	2005-07-24 22:24:39.000000000 +0200
++++ highlight-2.4-1/makefile	2005-08-08 20:07:16.000000000 +0200
 @@ -7,7 +7,7 @@
  data_dir = ${DESTDIR}/usr/share/highlight/
  
@@ -9,16 +9,18 @@
  
  # Location where the highlight man page will be installed:
  man_dir = ${DESTDIR}/usr/share/man/man1/
-@@ -16,7 +16,7 @@
+@@ -16,8 +16,9 @@
  doc_dir = ${DESTDIR}/usr/share/doc/highlight/
  
  # Location where the highlight examples will be installed:
 -examples_dir = ${doc_dir}examples/
 +examples_dir = $(DESTDIR)/${doc_dir}examples/
  
++etc_dir = $(DESTDIR)/etc/highlight
  
  # Commands:
-@@ -40,12 +40,6 @@
+ INSTALL_DATA=install -m644
+@@ -40,12 +41,6 @@
  	@echo "Binary directory:        ${bin_dir}"
  	@echo
  
@@ -31,7 +33,16 @@
  	${MKDIR} ${data_dir} \
  		${data_dir}themes \
  		${data_dir}langDefs \
-@@ -60,18 +54,6 @@
+@@ -53,25 +48,14 @@
+ 		${data_dir}helpmsg
+ 	${MKDIR} ${man_dir}
+ 	${MKDIR} ${bin_dir}
++	$(MKDIR) $(etc_dir)
+ 
+ 	${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/
+-	${INSTALL_DATA} ./*.conf ${data_dir}
++	${INSTALL_DATA} ./*.conf ${etc_dir}
+ 	${INSTALL_DATA} ./themes/*.style ${data_dir}themes/
  	${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
  	${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
  	${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- highlight.spec	10 Aug 2005 18:25:03 -0000	1.3
+++ highlight.spec	10 Aug 2005 19:09:47 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -53,6 +53,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
+- Rebuilt for FC-4/FC-3
+
 * Tue Aug  9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4-1-5
 - Fix #165302