rpms/highlight/devel highlight-2.4-makefile.patch, 1.3, 1.4 highlight-2.4-rpmoptflags.patch, 1.1, 1.2 highlight.spec, 1.6, 1.7
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Oct 10 17:05:41 UTC 2005
Author: s4504kr
Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16951
Modified Files:
highlight-2.4-makefile.patch highlight-2.4-rpmoptflags.patch
highlight.spec
Log Message:
Description:
Use of -DUSE_FN_MATCH
highlight-2.4-makefile.patch:
Index: highlight-2.4-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/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 9 Oct 2005 20:32:57 -0000 1.3
+++ highlight-2.4-makefile.patch 10 Oct 2005 17:05:39 -0000 1.4
@@ -1,5 +1,5 @@
--- highlight-2.4-2/makefile.mak 2005-09-22 22:51:16.000000000 +0200
-+++ highlight-2.4-2/makefile 2005-10-09 22:05:40.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/
highlight-2.4-rpmoptflags.patch:
Index: highlight-2.4-rpmoptflags.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/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 10 Oct 2005 17:05:39 -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/devel/highlight.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- highlight.spec 9 Oct 2005 20:32:57 -0000 1.6
+++ highlight.spec 10 Oct 2005 17:05:39 -0000 1.7
@@ -1,13 +1,16 @@
+%define hver 2.4
+%define lver 2
+
Name: highlight
Summary: Universal source code to formatted text converter
-Version: 2.4.2
-Release: 1%{?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-2.tar.gz
+Source0: http://www.andre-simon.de/zip/%{name}-%{hver}-%{lver}.tar.gz
Patch1: highlight-2.4-makefile.patch
Patch2: highlight-2.4-rpmoptflags.patch
@@ -22,7 +25,7 @@
It is easily possible to create new language definitions and colour themes.
%prep
-%setup -q -n %{name}-2.4-2
+%setup -q -n %{name}-%{hver}-%{lver}
%patch1 -p1 -b .mak
%patch2 -p1
@@ -49,7 +52,10 @@
%doc ChangeLog AUTHORS README* COPYING TODO examples/
%changelog
-* Sun Oct 9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-0
+* 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
More information about the fedora-extras-commits
mailing list