rpms/highlight/FC-4 highlight-2.4-makefile.patch, 1.3, 1.4 highlight.spec, 1.6, 1.7 sources, 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-serv16573

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

  Description:
    Sync FC-4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- highlight-2.4-makefile.patch	11 Oct 2005 16:03:01 -0000	1.3
+++ highlight-2.4-makefile.patch	1 Nov 2005 16:00:05 -0000	1.4
@@ -1,16 +1,5 @@
---- 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/
+--- highlight-2.4.3/makefile.org	2005-10-30 14:01:02.000000000 +0100
++++ highlight-2.4.3/makefile	2005-11-01 16:20:37.000000000 +0100
 @@ -46,13 +46,7 @@
  	@echo "Configuration directory: ${conf_dir}"
  	@echo


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- highlight.spec	11 Oct 2005 17:18:47 -0000	1.6
+++ highlight.spec	1 Nov 2005 16:00:05 -0000	1.7
@@ -1,16 +1,13 @@
-%define hver 2.4
-%define lver 2
-
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	%{hver}.%{lver}
-Release:	3%{?dist}
+Version:	2.4.3
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{hver}-%{lver}.tar.gz
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.4-makefile.patch
 Patch2:		highlight-2.4-rpmoptflags.patch
 
@@ -25,7 +22,7 @@
 It is easily possible to create new language definitions and colour themes.
 
 %prep
-%setup -q -n %{name}-%{hver}-%{lver}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 
@@ -52,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Nov  1 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.3-1
+- New upstream release
+
 * Tue Oct 11 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-3
 - Fix typo in highlight-2.4-rpmoptflags.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Oct 2005 17:18:47 -0000	1.3
+++ sources	1 Nov 2005 16:00:05 -0000	1.4
@@ -1 +1 @@
-44a58a1460cd4ccc1b3d684668e5f055  highlight-2.4-2.tar.gz
+19b0437361f84467fff11bdbeba654a0  highlight-2.4.3.tar.gz