diff --git a/highlight-2.4-etcdir.patch b/highlight-2.4-etcdir.patch new file mode 100644 index 0000000..c8d18be --- /dev/null +++ b/highlight-2.4-etcdir.patch @@ -0,0 +1,11 @@ +--- highlight-2.4-1/highlight/main.cpp.org 2005-08-08 20:00:11.000000000 +0200 ++++ highlight-2.4-1/highlight/main.cpp 2005-08-08 20:00:46.000000000 +0200 +@@ -132,7 +132,7 @@ + } + + bool HighlightApp::loadMapConfig(const string& name, StringMap* map){ +- string extPath=dataDir.getDir() + name + ".conf"; ++ string extPath="/etc/highlight/" + name + ".conf"; + ConfigurationReader config(extPath); + if (config.found() ) + { diff --git a/highlight.spec b/highlight.spec index 33402e0..dc59890 100644 --- a/highlight.spec +++ b/highlight.spec @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 3%{?dist} +Release: 5%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 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,11 +24,12 @@ It is easily possible to create new language definitions and colour themes. %prep %setup -q -n %{name}-2.4-1 -%patch1 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} LDFLAGS= %install rm -rf $RPM_BUILD_ROOT @@ -46,9 +48,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* +%config /etc/highlight/ + %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 +- Fix #165302 + +* Mon Aug 8 2005 Jochen Schmitt 2.4.1-4 +- Move extension.conf and scriptre.conf to /etc/highlight + * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 - Remove leading 'A' from summary line