rpms/highlight/EL-4 highlight-2.6.11-makefile.patch, NONE, 1.1 highlight.spec, 1.4, 1.5 sources, 1.2, 1.3 highlight-2.4-etcdir.patch, 1.1, NONE highlight-2.4-makefile.patch, 1.2, NONE highlight-2.4-rpmoptflags.patch, 1.1, NONE

Mon Sep 22 16:30:26 UTC 2008

Author: s4504kr

Update of /cvs/extras/rpms/highlight/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26320

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.11-makefile.patch 
Removed Files:
	highlight-2.4-etcdir.patch highlight-2.4-makefile.patch 
	highlight-2.4-rpmoptflags.patch 
Log Message:
Initional EL-4 release

highlight-2.6.11-makefile.patch:

--- NEW FILE highlight-2.6.11-makefile.patch ---
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
+++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
@@ -51,21 +51,12 @@ all-gui-wx29:
 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 \
@@ -80,22 +71,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} ./README_LANGLIST ${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_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
 
 	@echo
@@ -121,7 +96,6 @@ install-gui:
 uninstall:
 	@echo "Removing highlight files from system..."
 	${RMDIR} ${DESTDIR}${data_dir}
-	${RMDIR} ${DESTDIR}${doc_dir}
 	${RMDIR} ${DESTDIR}${conf_dir}
 	${RMDIR} ${DESTDIR}${examples_dir}
 	rm ${DESTDIR}${man_dir}highlight.1.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-4/highlight.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- highlight.spec	10 Aug 2005 19:12:22 -0000	1.4
+++ highlight.spec	22 Sep 2008 16:29:56 -0000	1.5
@@ -1,16 +1,16 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.1
-Release:	6%{?dist}
+Version:	2.6.12
+Release:	2%{?dist}
 
 Group:		Development/Tools
-License:	GPL
+License:	GPLv2
 
 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
-Patch3:         highlight-2.4-etcdir.patch
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
+Patch1:		highlight-2.6.11-makefile.patch
+
+BuildRequires:	wxGTK-devel
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -23,20 +23,37 @@
 It is easily possible to create new language definitions and colour themes.
 
 %prep
-%setup -q -n %{name}-2.4-1
-%patch1 -p1 
-%patch2 -p1
-%patch3 -p1
+%setup -q
+%patch1 -p1 -b .mak
+
+# Provides: exclude perl(highlight_pipe) from example
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
+__EOF__
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+# Requires: exclude perl(IPC::Open3) from example
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
+__EOF__
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
 
 %build
-make %{?_smp_mflags} LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight
+# Packaging this example causes lots of incorrect perl provides and 
+# requires. Since it isn't going to work out of the box, I'm nuking it.
+rm -rf examples/plugins/movabletype
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,11 +65,94 @@
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
 
-%config /etc/highlight/
+%config(noreplace) %{_sysconfdir}/highlight/
 
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.12-2
+- don't package broken examples, causes bogus perl provides/requires
+- don't claim to Provide: perl(highlight_pipe)
+- don't claim to Requires: perl(IPC::Open3)
+
+* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
+- New upstream release
+
+* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
+- New upstream release
+
+* Mon May 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.10-1
+- New upstream release
+
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.9-2
+- New upstream release
+
+* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.8-1
+- New upstream release
+
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.7-2
+- New upstream release
+- Fix gcc-4.3 issues
+
+* Tue Dec 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.6-1
+- New upstream release
+
+* Mon Oct 29 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.5-1
+- New upstream release
+
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
+- New upstream release
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.1-2
+- Changing license tag
+
+* 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
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
+- Rebuilt for FC-6
+
+* Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-1
+- New upstream release
+
+* Wed Mar 22 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.5-2
+- New upstream relase
+- Add gcc41 patch
+
+* Wed Mar 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-2
+- Add fixcodegen patch from Eric Hopper #184245
+
+* Sun Mar 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-1
+- New upstream release
+- Adapt rpmopt patch to new upstream release
+
+* Sun Feb 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.3-2
+- Rebuilt for FC5
+
+* Tue Nov  1 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.3-1
+- New upstream release
+
+* Tue Oct 11 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-3
+- Fix typo in highlight-2.4-rpmoptflags.patch
+
+* Mon Oct 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-2
+- Use -DUSE_FN_MATCH
+
+* Sun Oct  9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-1
+- New upstream release
+
 * Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
 - Rebuilt for FC-4/FC-3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 15:38:30 -0000	1.2
+++ sources	22 Sep 2008 16:29:56 -0000	1.3
@@ -1 +1 @@
-70066f7c4c0970fb84b0d84835d2f25f  highlight-2.4-1.tar.bz2
+5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz


--- highlight-2.4-etcdir.patch DELETED ---


--- highlight-2.4-makefile.patch DELETED ---


--- highlight-2.4-rpmoptflags.patch DELETED ---


