Description: Use of -DUSE_FN_MATCH

This commit is contained in:
Jochen Schmitt 2005-10-10 17:05:39 +00:00
parent 27cdf35ea4
commit 23853a57a2
3 changed files with 23 additions and 17 deletions

View File

@ -1,5 +1,5 @@
--- highlight-2.4-2/makefile.mak 2005-09-22 22:51:16.000000000 +0200 --- 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 @@ @@ -9,8 +9,8 @@
data_dir = ${DESTDIR}/usr/share/highlight/ data_dir = ${DESTDIR}/usr/share/highlight/

View File

@ -1,11 +1,11 @@
--- highlight-2.4-1/highlight/makefile.BAD 2005-08-03 10:44:08.000000000 -0500 --- highlight-2.4-2/highlight/makefile.rpx 2005-08-04 19:49:31.000000000 +0200
+++ highlight-2.4-1/highlight/makefile 2005-08-03 10:44:36.000000000 -0500 +++ highlight-2.4-2/highlight/makefile 2005-10-10 18:22:14.000000000 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
CXX=c++ CXX=c++
-CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
+CFLAGS := $(RPM_OPT_FLAGS) -DHL_DATA_DIR=\"${HL_DATA_DIR}\" +CFLAGS := $(RPM_OPTS_FLAG) -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH
LDFLAGS = -L/usr/lib -s LDFLAGS = -L/usr/lib -s

View File

@ -1,13 +1,16 @@
%define hver 2.4
%define lver 2
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 2.4.2 Version: %{hver}.%{lver}
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPL License: GPL
URL: http://www.andre-simon.de/ 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 Patch1: highlight-2.4-makefile.patch
Patch2: highlight-2.4-rpmoptflags.patch Patch2: highlight-2.4-rpmoptflags.patch
@ -22,7 +25,7 @@ The utility offers indentation and reformatting capabilities.
It is easily possible to create new language definitions and colour themes. It is easily possible to create new language definitions and colour themes.
%prep %prep
%setup -q -n %{name}-2.4-2 %setup -q -n %{name}-%{hver}-%{lver}
%patch1 -p1 -b .mak %patch1 -p1 -b .mak
%patch2 -p1 %patch2 -p1
@ -49,7 +52,10 @@ rm -rf $RPM_BUILD_ROOT
%doc ChangeLog AUTHORS README* COPYING TODO examples/ %doc ChangeLog AUTHORS README* COPYING TODO examples/
%changelog %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 - New upstream release
* Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6 * Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6