packages: highlight/highlight-Makefile.patch, highlight/highlight.spec - up...

[gotar]

Author: gotar                        Date: Wed May 27 17:17:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 2.9

---- Files affected:
packages/highlight:
   highlight-Makefile.patch (1.1 -> 1.2) , highlight.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/highlight/highlight-Makefile.patch
diff -u packages/highlight/highlight-Makefile.patch:1.1 packages/highlight/highlight-Makefile.patch:1.2
--- packages/highlight/highlight-Makefile.patch:1.1	Tue Nov  1 17:07:40 2005
+++ packages/highlight/highlight-Makefile.patch	Wed May 27 19:17:36 2009
@@ -1,7 +1,7 @@
---- highlight-2.4.3/highlight/makefile~	2005-11-01 16:09:28.383916928 +0100
-+++ highlight-2.4.3/highlight/makefile	2005-11-01 16:13:00.357692016 +0100
+--- highlight-2.9/src/makefile.orig	2009-04-23 05:32:21.000000000 +0200
++++ highlight-2.9/src/makefile	2009-05-27 18:57:01.000000000 +0200
 @@ -2,7 +2,7 @@
- # This file will compile the highlight binary.
+ # This file will compile the highlight library and binaries.
  # See INSTALL for instructions.
  
 -# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a
@@ -9,27 +9,21 @@
  # custom installation directory not listed in INSTALL.
  # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.
  # See ../makefile for the definition of ${data_dir}
-@@ -15,11 +15,11 @@
+@@ -17,7 +17,7 @@
  
  CXX=c++
  
--CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
-+override CXXFLAGS += -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
+-CFLAGS:=-O2 ${CFLAGS}
++CXXFLAGS:=-O2 ${CXXFLAGS}
  
--LDFLAGS = -L/usr/lib -s
-+LDFLAGS =
- 
--CXX_COMPILE = ${CXX} ${CFLAGS} -c
-+CXX_COMPILE = ${CXX} ${CXXFLAGS} -c
- CXX_LINK = ${CXX} ${LDFLAGS} -o highlight ${OBJECTFILES}
- 
- OBJECTFILES :=  main.o configurationreader.o stylecolour.o stringtools.o \
-@@ -38,7 +38,7 @@
- 
- ifeq ($(USE_LOCAL_GETOPT),true)
- 	OBJECTFILES:=${OBJECTFILES} getopt.o
--	CFLAGS:=${CFLAGS} -DUSE_LOCAL_GETOPT
-+	CXXFLAGS:=${CXXFLAGS} -DUSE_LOCAL_GETOPT
- endif
+ # Source paths
+ CORE_DIR=./core/
+@@ -42,7 +42,7 @@ endif
+ #LDFLAGS = ${LDFLAGS} -s
+ #LDFLAGS= -Wl,--as-needed
  
+-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${CORE_DIR}
++CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${CORE_DIR}
  
+ # Data directories (data dir, configuration file dir)
+ CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"

================================================================
Index: packages/highlight/highlight.spec
diff -u packages/highlight/highlight.spec:1.8 packages/highlight/highlight.spec:1.9
--- packages/highlight/highlight.spec:1.8	Fri Apr 27 15:08:56 2007
+++ packages/highlight/highlight.spec	Wed May 27 19:17:36 2009
@@ -1,17 +1,19 @@
 # $Revision$, $Date$
 #
+# TODO:		gui subpackage (build requires qt4)
+#
 # Conditional build:
 %bcond_without	apidocs # don't generate apidocs subpackage
 #
 Summary:	A source code converter to HTML, XHTML, RTF, TeX, LaTeX, XSL-FO, and XML
 Summary(pl.UTF-8):	Konwerter kodu źródłowego do formatów HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Name:		highlight
-Version:	2.4.3
-Release:	2
+Version:	2.9
+Release:	1
 License:	GPL
 Group:		Applications/Publishing
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
-# Source0-md5:	19b0437361f84467fff11bdbeba654a0
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+# Source0-md5:	8db826438cc44ad666e9140e8f2c85c8
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.andre-simon.de/
 %{?with_apidocs:BuildRequires:	doxygen}
@@ -75,9 +77,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README README_INDENT README_REGEX TODO examples
+%doc AUTHORS ChangeLog README README_INDENT README_LANGLIST README_REGEX TODO examples
 %lang(de) %doc README_DE
-%lang(es) %doc README_ES
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_mandir}/man1/*
@@ -96,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/05/27 17:17:36  gotar
+- upgraded to 2.9
+
 Revision 1.8  2007/04/27 13:08:56  megabajt
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/highlight/highlight-Makefile.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/highlight/highlight.spec?r1=1.8&r2=1.9&f=u