rpms/highlight/devel highlight-2.4-etcdir.patch, NONE, 1.1 highlight-2.4-makefile.patch, 1.1, 1.2 highlight.spec, 1.2, 1.3

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Mon Aug 8 18:18:07 UTC 2005


Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139

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

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



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() )
     {

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- highlight-2.4-makefile.patch	4 Aug 2005 15:38:30 -0000	1.1
+++ highlight-2.4-makefile.patch	8 Aug 2005 18:18:05 -0000	1.2
@@ -1,5 +1,5 @@
 --- highlight-2.4-1/makefile.org	2005-07-19 11:27:46.000000000 +0200
-+++ highlight-2.4-1/makefile	2005-07-24 22:24:39.000000000 +0200
++++ highlight-2.4-1/makefile	2005-08-08 20:07:16.000000000 +0200
 @@ -7,7 +7,7 @@
  data_dir = ${DESTDIR}/usr/share/highlight/
  
@@ -9,16 +9,18 @@
  
  # Location where the highlight man page will be installed:
  man_dir = ${DESTDIR}/usr/share/man/man1/
-@@ -16,7 +16,7 @@
+@@ -16,8 +16,9 @@
  doc_dir = ${DESTDIR}/usr/share/doc/highlight/
  
  # Location where the highlight examples will be installed:
 -examples_dir = ${doc_dir}examples/
 +examples_dir = $(DESTDIR)/${doc_dir}examples/
  
++etc_dir = $(DESTDIR)/etc/highlight
  
  # Commands:
-@@ -40,12 +40,6 @@
+ INSTALL_DATA=install -m644
+@@ -40,12 +41,6 @@
  	@echo "Binary directory:        ${bin_dir}"
  	@echo
  
@@ -31,7 +33,16 @@
  	${MKDIR} ${data_dir} \
  		${data_dir}themes \
  		${data_dir}langDefs \
-@@ -60,18 +54,6 @@
+@@ -53,25 +48,14 @@
+ 		${data_dir}helpmsg
+ 	${MKDIR} ${man_dir}
+ 	${MKDIR} ${bin_dir}
++	$(MKDIR) $(etc_dir)
+ 
+ 	${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/
+-	${INSTALL_DATA} ./*.conf ${data_dir}
++	${INSTALL_DATA} ./*.conf ${etc_dir}
+ 	${INSTALL_DATA} ./themes/*.style ${data_dir}themes/
  	${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
  	${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
  	${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/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	8 Aug 2005 18:18:05 -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:	4%{?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,8 +24,9 @@
 
 %prep
 %setup -q -n %{name}-2.4-1
-%patch1 -p1
+%patch1 -p1 -b .org
 %patch2 -p1
+%patch3 -p1
 
 %build
 make %{?_smp_mflags}
@@ -46,9 +48,14 @@
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
 
+%config /etc/highlight/
+
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* 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
 




More information about the fedora-extras-commits mailing list