From caf72d542262f8a8b77446fc07aeeb034e9ee681 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:54:38 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for source-highlight --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 97698040f95c07794519cb82e2a4ba3b1cf6e3b9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:42:07 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index deed466..3c2fae7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := source-highlight SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5bd91cba6c9911faa2463a3f08c4d7053894070e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 7 Jun 2010 12:52:41 +0000 Subject: [PATCH 3/5] - updated to 3.1.3 - change configure command so it finds boost_regex - fix source url's - add devel package - fix directory ownership - fix rpath on binary --- source-highlight.spec | 55 ++++++++++++++++++++++++++++++++++++------- sources | 4 ++-- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/source-highlight.spec b/source-highlight.spec index bdcb239..ce464bf 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,15 +1,15 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 2.10 -Release: 4%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Group: Development/Tools License: GPLv3+ -Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.10.tar.gz -Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.10.tar.gz.sig +Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, boost-devel -BuildRequires: help2man, ctags +BuildRequires: help2man, ctags, chrpath Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Requires: ctags @@ -21,11 +21,22 @@ Java, Javascript, C/C++, Prolog, Perl, Php3, Python, Flex, ChangeLog, Ruby, Lua, Caml, Sml and Log as source languages, and HTML, XHTML and ANSI color escape sequences as output format. + +%package devel +Summary: Development files for source-highlight +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +Development files for source-highlight + %prep %setup -q %build -%configure +%configure --disable-static \ + --with-boost-regex=boost_regex make %{?_smp_mflags} %install @@ -36,11 +47,16 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs %{__sed} -i 's/\r//' docs/source-highlight/*.css rm -f $RPM_BUILD_ROOT%{_infodir}/dir +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings %clean rm -rf $RPM_BUILD_ROOT %post +/sbin/ldconfig /sbin/install-info %{_infodir}/source-highlight.info \ %{_infodir}/dir 2>/dev/null || : @@ -50,6 +66,8 @@ if [ $1 -eq 0 ]; then %{_infodir}/dir 2>/dev/null || : fi +%postun -p /sbin/ldconfig + %files %defattr (-,root,root) %doc docs/source-highlight/* @@ -57,12 +75,33 @@ fi %{_bindir}/java2html %{_bindir}/source-highlight %{_bindir}/check-regexp +%{_bindir}/source-highlight-settings %{_bindir}/src-hilite-lesspipe.sh -%{_datadir}/%{name} +%dir %{_sysconfdir}/bash_completion.d +%{_sysconfdir}/bash_completion.d/source-highlight-bash-completion +%{_libdir}/libsource-highlight.so.* +%dir %{_datadir}/source-highlight +%{_datadir}/source-highlight/* %{_mandir}/man1/* -%{_infodir}/source-highlight.info* +%{_infodir}/source-highlight*.info* + +%files devel +%defattr (-,root,root) +%dir %{_includedir}/srchilite +%{_libdir}/libsource-highlight.so +%{_libdir}/pkgconfig/source-highlight.pc +%{_includedir}/srchilite/*.h +%{_datadir}/aclocal/ax_boost_*.m4 %changelog +* Fri Jun 04 2010 Leigh Scott - 3.1.3-1 +- updated to 3.1.3 +- change configure command so it finds boost_regex +- fix source url's +- add devel package +- fix directory ownership +- fix rpath on binary + * Sun Jul 26 2009 Fedora Release Engineering - 2.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a7e32a7..7b823da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -03e9cf03580873b76ca0a89f0468b146 source-highlight-2.10.tar.gz -bf7f58f661d557bb28177e71fc8bf740 source-highlight-2.10.tar.gz.sig +da08105ba80191fbfacf47999252b274 source-highlight-3.1.3.tar.gz +86a367ffa7d43d72aa411d974789718b source-highlight-3.1.3.tar.gz.sig From d6cfe56084c3d6d519c8b80bb2ce1de7410af584 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:01:11 +0000 Subject: [PATCH 4/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3c2fae7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: source-highlight -# $Id$ -NAME := source-highlight -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 720c68e306f5b588c0d8c07612ae15117488ba31 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 16 Aug 2010 11:56:48 +0100 Subject: [PATCH 5/5] * Mon Aug 16 2010 Leigh Scott - 3.1.4-1 - updated to 3.1.4 --- source-highlight.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source-highlight.spec b/source-highlight.spec index ce464bf..54cf4fe 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,6 +1,6 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 3.1.3 +Version: 3.1.4 Release: 1%{?dist} Group: Development/Tools License: GPLv3+ @@ -93,7 +93,11 @@ fi %{_includedir}/srchilite/*.h %{_datadir}/aclocal/ax_boost_*.m4 + %changelog +* Mon Aug 16 2010 Leigh Scott - 3.1.4-1 +- updated to 3.1.4 + * Fri Jun 04 2010 Leigh Scott - 3.1.3-1 - updated to 3.1.3 - change configure command so it finds boost_regex diff --git a/sources b/sources index 7b823da..2579135 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -da08105ba80191fbfacf47999252b274 source-highlight-3.1.3.tar.gz -86a367ffa7d43d72aa411d974789718b source-highlight-3.1.3.tar.gz.sig +ef28c8d10324a140fb0187ef769ce726 source-highlight-3.1.4.tar.gz.sig +becf8292b84ece6b532b0f0c92b530ee source-highlight-3.1.4.tar.gz