rpms/highlight/devel highlight-2.4-makefile.patch, NONE, 1.1 highlight-2.4-rpmoptflags.patch, NONE, 1.1 highlight.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	.cvsignore sources 
Added Files:
	highlight-2.4-makefile.patch highlight-2.4-rpmoptflags.patch 
	highlight.spec 
Log Message:
auto-import highlight-2.4.1-3 on branch devel from highlight-2.4.1-3.src.rpm

highlight-2.4-makefile.patch:

--- NEW FILE highlight-2.4-makefile.patch ---
--- 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
@@ -7,7 +7,7 @@
 data_dir = ${DESTDIR}/usr/share/highlight/
 
 # Location where the highlight binary will be installed:
-bin_dir = ${DESTDIR}/usr/local/bin/
+bin_dir = ${DESTDIR}/usr/bin/
 
 # Location where the highlight man page will be installed:
 man_dir = ${DESTDIR}/usr/share/man/man1/
@@ -16,7 +16,7 @@
 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/
 
 
 # Commands:
@@ -40,12 +40,6 @@
 	@echo "Binary directory:        ${bin_dir}"
 	@echo
 
-	${MKDIR} ${doc_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 \
@@ -60,18 +54,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

highlight-2.4-rpmoptflags.patch:

--- NEW FILE highlight-2.4-rpmoptflags.patch ---
--- highlight-2.4-1/highlight/makefile.BAD	2005-08-03 10:44:08.000000000 -0500
+++ highlight-2.4-1/highlight/makefile	2005-08-03 10:44:36.000000000 -0500
@@ -15,7 +15,7 @@
 
 CXX=c++
 
-CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
+CFLAGS := $(RPM_OPT_FLAGS) -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
 
 LDFLAGS = -L/usr/lib -s
 


--- NEW FILE highlight.spec ---
Name: 		highlight
Summary: 	Universal source code to formatted text converter
Version: 	2.4.1
Release: 	3%{?dist}

Group: 		Development/Tools
License: 	GPL

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

Buildroot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

%description
A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX,
XSL-FO, XML or ANSI escape sequences with syntax highlighting.
It supports several programming and markup languages.
Language descriptions are configurable and support regular expressions.
The utility offers indentation and reformatting capabilities.
It is easily possible to create new language definitions and colour themes.

%prep
%setup -q -n %{name}-2.4-1
%patch1 -p1
%patch2 -p1

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)

%{_bindir}/highlight
%{_datadir}/highlight/
%{_mandir}/man1/highlight.1.gz

%doc ChangeLog AUTHORS README* COPYING TODO examples//

%changelog
* Wed Aug  3 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-3
- Remove leading 'A' from summary line

* Wed Aug  3 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-2
- Add rpmoptflags patch from Tom Callaway

* Wed Aug  3 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-1
- Change versioning schema
- Add suggested changes from Oliver

* Sun Jul 24 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Aug 2005 15:37:32 -0000	1.1
+++ .cvsignore	4 Aug 2005 15:38:30 -0000	1.2
@@ -0,0 +1 @@
+highlight-2.4-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Aug 2005 15:37:32 -0000	1.1
+++ sources	4 Aug 2005 15:38:30 -0000	1.2
@@ -0,0 +1 @@
+70066f7c4c0970fb84b0d84835d2f25f  highlight-2.4-1.tar.bz2