rpms/highlight/FC-3 highlight-2.4-etcdir.patch, NONE, 1.1 highlight.spec, 1.2, 1.3

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	highlight.spec 
Added Files:
	highlight-2.4-etcdir.patch 
Log Message:

  Description:
    Move extension.conf and scriptre.conf to /etc/highlight
    Fixed #165302



highlight-2.4-etcdir.patch:

--- NEW FILE highlight-2.4-etcdir.patch ---
--- 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() )
     {


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-3/highlight.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- highlight.spec	4 Aug 2005 15:42:26 -0000	1.2
+++ highlight.spec	10 Aug 2005 18:26:49 -0000	1.3
@@ -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 @@
 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 @@
 
 %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 @@
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
 
+%config /etc/highlight/
+
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Aug  9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4-1-5
+- Fix #165302
+
+* Mon Aug  8 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-4
+- Move extension.conf and scriptre.conf to /etc/highlight
+
 * Wed Aug  3 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-3
 - Remove leading 'A' from summary line