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

Tue Oct 11 16:03:03 UTC 2005

Author: s4504kr

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

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

  Description:
    Bring FC-4 in synch with Devel


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- highlight-2.4-makefile.patch	10 Aug 2005 19:09:47 -0000	1.2
+++ highlight-2.4-makefile.patch	11 Oct 2005 16:03:01 -0000	1.3
@@ -1,30 +1,22 @@
---- highlight-2.4-1/makefile.org	2005-07-19 11:27:46.000000000 +0200
-+++ highlight-2.4-1/makefile	2005-08-08 20:07:16.000000000 +0200
-@@ -7,7 +7,7 @@
+--- highlight-2.4-2/makefile.mak	2005-09-22 22:51:16.000000000 +0200
++++ highlight-2.4-2/makefile	2005-10-10 18:19:47.000000000 +0200
+@@ -9,8 +9,8 @@
  data_dir = ${DESTDIR}/usr/share/highlight/
  
  # Location where the highlight binary will be installed:
 -bin_dir = ${DESTDIR}/usr/local/bin/
+-# bin_dir = ${DESTDIR}/usr/bin/
++# bin_dir = ${DESTDIR}/usr/local/bin/
 +bin_dir = ${DESTDIR}/usr/bin/
  
  # Location where the highlight man page will be installed:
  man_dir = ${DESTDIR}/usr/share/man/man1/
-@@ -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:
- INSTALL_DATA=install -m644
-@@ -40,12 +41,6 @@
- 	@echo "Binary directory:        ${bin_dir}"
+@@ -46,13 +46,7 @@
+ 	@echo "Configuration directory: ${conf_dir}"
  	@echo
  
 -	${MKDIR} ${doc_dir}
+ 	${MKDIR} ${conf_dir}
 -	${MKDIR} ${examples_dir} \
 -		${examples_dir}cgi \
 -		${examples_dir}cgi/perl \
@@ -33,16 +25,7 @@
  	${MKDIR} ${data_dir} \
  		${data_dir}themes \
  		${data_dir}langDefs \
-@@ -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/
+@@ -67,18 +61,6 @@
  	${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
  	${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
  	${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}

highlight-2.4-rpmoptflags.patch:

Index: highlight-2.4-rpmoptflags.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/highlight-2.4-rpmoptflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- highlight-2.4-rpmoptflags.patch	4 Aug 2005 15:38:30 -0000	1.1
+++ highlight-2.4-rpmoptflags.patch	11 Oct 2005 16:03:01 -0000	1.2
@@ -1,11 +1,11 @@
---- highlight-2.4-1/highlight/makefile.BAD	2005-08-03 10:44:08.000000000 -0500
-+++ highlight-2.4-1/highlight/makefile	2005-08-03 10:44:36.000000000 -0500
-@@ -15,7 +15,7 @@
- 
- CXX=c++
- 
--CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
-+CFLAGS := $(RPM_OPT_FLAGS) -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
- 
- LDFLAGS = -L/usr/lib -s
- 
+--- highlight-2.4-2/highlight/makefile.rpx	2005-08-04 19:49:31.000000000 +0200
++++ highlight-2.4-2/highlight/makefile	2005-10-10 18:22:14.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ CXX=c++
+ 
+-CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
++CFLAGS := $(RPM_OPTS_FLAG) -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH
+ 
+ LDFLAGS = -L/usr/lib -s
+ 


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- highlight.spec	10 Aug 2005 19:09:47 -0000	1.4
+++ highlight.spec	11 Oct 2005 16:03:01 -0000	1.5
@@ -1,16 +1,18 @@
+%define hver 2.4
+%define lver 2
+
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.1
-Release:	6%{?dist}
+Version:	%{hver}.%{lver}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPL
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2
+Source0:	http://www.andre-simon.de/zip/%{name}-%{hver}-%{lver}.tar.gz
 Patch1:		highlight-2.4-makefile.patch
 Patch2:		highlight-2.4-rpmoptflags.patch
-Patch3:         highlight-2.4-etcdir.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -23,10 +25,9 @@
 It is easily possible to create new language definitions and colour themes.
 
 %prep
-%setup -q -n %{name}-2.4-1
-%patch1 -p1 
+%setup -q -n %{name}-%{hver}-%{lver}
+%patch1 -p1 -b .mak
 %patch2 -p1
-%patch3 -p1
 
 %build
 make %{?_smp_mflags} LDFLAGS=
@@ -36,8 +37,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,6 +52,12 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-2
+- Use -DUSE_FN_MATCH
+
+* Sun Oct  9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-1
+- New upstream release
+
 * Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
 - Rebuilt for FC-4/FC-3
 


