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

New upstream release

Browse Source
This commit is contained in:
Jochen Schmitt 2007-07-10 18:38:16 +00:00
parent 44b9fb9a2d
commit 4a5cdc1925
7 changed files with 85 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
highlight-2.4.8.tar.gz
highlight-2.6.1.tar.gz

35
highlight-2.4-makefile.patch
View File

@ -1,35 +0,0 @@
--- highlight-2.4.3/makefile.org 2005-10-30 14:01:02.000000000 +0100
+++ highlight-2.4.3/makefile 2005-11-01 16:20:37.000000000 +0100
@@ -46,13 +46,7 @@
@echo "Configuration directory: ${conf_dir}"
@echo
- ${MKDIR} ${doc_dir}
${MKDIR} ${conf_dir}
- ${MKDIR} ${examples_dir} \
- ${examples_dir}cgi \
- ${examples_dir}cgi/perl \
- ${examples_dir}cgi/php \
- ${examples_dir}swig
${MKDIR} ${data_dir} \
${data_dir}themes \
${data_dir}langDefs \
@@ -67,18 +61,6 @@
${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}
- ${INSTALL_DATA} ./AUTHORS ${doc_dir}
- ${INSTALL_DATA} ./README ${doc_dir}
- ${INSTALL_DATA} ./README_DE ${doc_dir}
- ${INSTALL_DATA} ./README_INDENT ${doc_dir}
- ${INSTALL_DATA} ./ChangeLog ${doc_dir}
- ${INSTALL_DATA} ./COPYING ${doc_dir}
- ${INSTALL_DATA} ./INSTALL ${doc_dir}
- ${INSTALL_DATA} ./examples/cgi/php/* ${examples_dir}cgi/php
- ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${examples_dir}swig
- ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${examples_dir}swig
- ${INSTALL_DATA} ./examples/swig/README_SWIG ${doc_dir}
- ${INSTALL_PROGRAM} ./examples/cgi/perl/highlight.cgi ${examples_dir}cgi/perl
${INSTALL_PROGRAM} ./highlight/highlight ${bin_dir}
@echo

11
highlight-2.4-rpmoptflags.patch
View File

@ -1,11 +0,0 @@
--- highlight-2.4.7/highlight/makefile.org 2006-07-04 20:50:59.000000000 +0200
+++ highlight-2.4.7/highlight/makefile 2006-07-04 20:51:53.000000000 +0200
@@ -15,7 +15,7 @@
CXX=c++
-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
+CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
#CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -ggdb
LDFLAGS = -s

62
highlight-2.6.1-makefile.patch Normal file
View File

@ -0,0 +1,62 @@
--- highlight-2.6.1/makefile.mak 2007-06-21 23:32:34.000000000 +0200
+++ highlight-2.6.1/makefile 2007-07-10 20:16:18.000000000 +0200
@@ -25,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/
examples_dir = ${PREFIX}/share/doc/highlight/examples/
# Location of the highlight config files:
-conf_dir = ${PREFIX}/etc/highlight/
+conf_dir = /etc/highlight/
# Commands:
INSTALL_DATA=install -m644
@@ -47,21 +47,12 @@ all-gui:
install:
@echo "This script will install highlight in the following directories:"
@echo "Data directory: ${DESTDIR}${data_dir}"
- @echo "Documentation directory: ${DESTDIR}${doc_dir}"
- @echo "Examples directory: ${DESTDIR}${examples_dir}"
@echo "Manual directory: ${DESTDIR}${man_dir}"
@echo "Binary directory: ${DESTDIR}${bin_dir}"
@echo "Configuration directory: ${DESTDIR}${conf_dir}"
@echo
- ${MKDIR} ${DESTDIR}${doc_dir}
${MKDIR} ${DESTDIR}${conf_dir}
- ${MKDIR} ${DESTDIR}${examples_dir} \
- ${DESTDIR}${examples_dir}plugins \
- ${DESTDIR}${examples_dir}plugins/dokuwiki \
- ${DESTDIR}${examples_dir}plugins/movabletype \
- ${DESTDIR}${examples_dir}plugins/wordpress \
- ${DESTDIR}${examples_dir}swig
${MKDIR} ${DESTDIR}${data_dir} \
${DESTDIR}${data_dir}themes \
${DESTDIR}${data_dir}langDefs \
@@ -76,20 +67,6 @@ install:
${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
- ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
- ${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
- ${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
- ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
- ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
- ${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
@echo
@@ -115,7 +92,6 @@ install-gui:
uninstall:
@echo "Removing highlight files from system..."
${RMDIR} ${DESTDIR}${data_dir}
- ${RMDIR} ${DESTDIR}${doc_dir}
${RMDIR} ${DESTDIR}${conf_dir}
rm ${DESTDIR}${man_dir}highlight.1.gz
rm ${DESTDIR}${bin_dir}highlight

11
highlight-2.6.1-rpmoptflags.patch Normal file
View File

@ -0,0 +1,11 @@
--- highlight-2.6.1/src/makefile.bak 2007-03-07 22:29:19.000000000 +0100
+++ highlight-2.6.1/src/makefile 2007-07-10 20:08:43.000000000 +0200
@@ -15,7 +15,7 @@
CXX=c++
-CFLAGS := -O2
+CFLAGS := ${RPM_OPT_FLAGS}
#CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -ggdb
LDFLAGS = -s

17
highlight.spec
View File

@ -1,15 +1,15 @@
Name: highlight
Summary: Universal source code to formatted text converter
Version: 2.4.8
Release: 2%{?dist}
Version: 2.6.1
Release: 1%{?dist}
Group: Development/Tools
License: GPL
URL: http://www.andre-simon.de/
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
Patch1: highlight-2.4-makefile.patch
Patch2: highlight-2.4-rpmoptflags.patch
Patch1: highlight-2.6.1-makefile.patch
Patch2: highlight-2.6.1-rpmoptflags.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@ -23,7 +23,7 @@ It is easily possible to create new language definitions and colour themes.
%prep
%setup -q
%patch1 -p1
%patch1 -p1 -b .mak
%patch2 -p1 -b .bak
%build
@ -44,12 +44,15 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/highlight/
%{_mandir}/man1/highlight.1*
%config /etc/highlight/
%config(noreplace) %{_sysconfdir}/highlight/
%doc ChangeLog AUTHORS README* COPYING TODO examples/
%changelog
* Tue Feb 6 2007 Jochen Schmitt <s4504kr@zeus.herr-schmitt.de> 2.4.8-2
* Tue Jul 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-1
- New upstream release
* Tue Feb 6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-2
- fir rpmopt bug (#227292)
* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1

2
sources
View File

@ -1 +1 @@
8ffb1d62ef449ecf5ffef1f6931a3d16 highlight-2.4.8.tar.gz
06aed47f316aeb6a2c9bea5be3cc954e highlight-2.6.1.tar.gz