From cefe703e6d4020e27e88caec0b9cb04e1e9b91af Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Aug 04 2005 15:38:30 +0000 Subject: auto-import highlight-2.4.1-3 on branch devel from highlight-2.4.1-3.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..8a0aa95 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +highlight-2.4-1.tar.bz2 diff --git a/highlight-2.4-makefile.patch b/highlight-2.4-makefile.patch new file mode 100644 index 0000000..a2e5ceb --- /dev/null +++ b/highlight-2.4-makefile.patch @@ -0,0 +1,52 @@ +--- 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 diff --git a/highlight-2.4-rpmoptflags.patch b/highlight-2.4-rpmoptflags.patch new file mode 100644 index 0000000..48c2d04 --- /dev/null +++ b/highlight-2.4-rpmoptflags.patch @@ -0,0 +1,11 @@ +--- 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 + diff --git a/highlight.spec b/highlight.spec new file mode 100644 index 0000000..5619873 --- /dev/null +++ b/highlight.spec @@ -0,0 +1,64 @@ +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 2.4.1-3 +- Remove leading 'A' from summary line + +* Wed Aug 3 2005 Jochen Schmitt 2.4.1-2 +- Add rpmoptflags patch from Tom Callaway + +* Wed Aug 3 2005 Jochen Schmitt 2.4.1-1 +- Change versioning schema +- Add suggested changes from Oliver + +* Sun Jul 24 2005 Jochen Schmitt 2.4-1 +- Initial build + diff --git a/sources b/sources index e69de29..a5014a9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +70066f7c4c0970fb84b0d84835d2f25f highlight-2.4-1.tar.bz2