rpms/highlight
5
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Jochen Schmitt 2005-08-08 18:18:05 +00:00
parent d5eab8fa1b
commit eb1e139898
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
highlight-2.4-etcdir.patch Normal file
View File

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

19
highlight-2.4-makefile.patch
View File

@ -1,5 +1,5 @@
--- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200 --- 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 @@ @@ -7,7 +7,7 @@
data_dir = ${DESTDIR}/usr/share/highlight/ data_dir = ${DESTDIR}/usr/share/highlight/
@ -9,16 +9,18 @@
# Location where the highlight man page will be installed: # Location where the highlight man page will be installed:
man_dir = ${DESTDIR}/usr/share/man/man1/ man_dir = ${DESTDIR}/usr/share/man/man1/
@@ -16,7 +16,7 @@ @@ -16,8 +16,9 @@
doc_dir = ${DESTDIR}/usr/share/doc/highlight/ doc_dir = ${DESTDIR}/usr/share/doc/highlight/
# Location where the highlight examples will be installed: # Location where the highlight examples will be installed:
-examples_dir = ${doc_dir}examples/ -examples_dir = ${doc_dir}examples/
+examples_dir = $(DESTDIR)/${doc_dir}examples/ +examples_dir = $(DESTDIR)/${doc_dir}examples/
+etc_dir = $(DESTDIR)/etc/highlight
# Commands: # Commands:
@@ -40,12 +40,6 @@ INSTALL_DATA=install -m644
@@ -40,12 +41,6 @@
@echo "Binary directory: ${bin_dir}" @echo "Binary directory: ${bin_dir}"
@echo @echo
@ -31,7 +33,16 @@
${MKDIR} ${data_dir} \ ${MKDIR} ${data_dir} \
${data_dir}themes \ ${data_dir}themes \
${data_dir}langDefs \ ${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} ./indentSchemes/*.indent ${data_dir}indentSchemes/
${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/ ${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
${INSTALL_DATA} ./man/highlight.1.gz ${man_dir} ${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}

11
highlight.spec
View File

@ -1,7 +1,7 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 2.4.1 Version: 2.4.1
Release: 3%{?dist} Release: 4%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPL 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 Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2
Patch1: highlight-2.4-makefile.patch Patch1: highlight-2.4-makefile.patch
Patch2: highlight-2.4-rpmoptflags.patch Patch2: highlight-2.4-rpmoptflags.patch
Patch3: highlight-2.4-etcdir.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@ -23,8 +24,9 @@ It is easily possible to create new language definitions and colour themes.
%prep %prep
%setup -q -n %{name}-2.4-1 %setup -q -n %{name}-2.4-1
%patch1 -p1 %patch1 -p1 -b .org
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
make %{?_smp_mflags} make %{?_smp_mflags}
@ -46,9 +48,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/highlight/ %{_datadir}/highlight/
%{_mandir}/man1/highlight.1* %{_mandir}/man1/highlight.1*
%config /etc/highlight/
%doc ChangeLog AUTHORS README* COPYING TODO examples/ %doc ChangeLog AUTHORS README* COPYING TODO examples/
%changelog %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 * Wed Aug 3 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-3
- Remove leading 'A' from summary line - Remove leading 'A' from summary line