From 43289b234e097995053ea7bbf1d1a7e44094f7bd Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Sep 26 2012 11:43:47 +0000 Subject: Update to 1.6.6 - paches merged - enscript-1.6.4-hilight.patch - enscript-1.6.4-rh457719.patch Signed-off-by: Adam Tkac --- diff --git a/.gitignore b/.gitignore index 75465e1..261e531 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ enscript-php-1.6.4.st enscript-ruby-1.6.4.tar.gz enscript-1.6.5.2.tar.gz +/enscript-1.6.6.tar.gz diff --git a/enscript-1.6.4-hilight.patch b/enscript-1.6.4-hilight.patch deleted file mode 100644 index c0f85cb..0000000 --- a/enscript-1.6.4-hilight.patch +++ /dev/null @@ -1,1241 +0,0 @@ -diff -up enscript-1.6.5.1/states/hl/changelog.st.hilight enscript-1.6.5.1/states/hl/changelog.st ---- enscript-1.6.5.1/states/hl/changelog.st.hilight 2009-01-24 21:59:34.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/changelog.st 2010-05-20 15:28:08.148580599 +0200 -@@ -43,7 +43,7 @@ state changelog extends HighlightEntry - } - - /* File descriptions without function names. */ -- /(^\t\* )([^ :]+)(:)/ { -+ /(^\t\* )([^:]+)(:)/ { - language_print ($1); - - function_name_face (true); -diff -up enscript-1.6.5.1/states/hl/dylan.st.hilight enscript-1.6.5.1/states/hl/dylan.st ---- enscript-1.6.5.1/states/hl/dylan.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/dylan.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,124 @@ -+/** -+ * Name: dylan -+ * Description: Dylan Programming Language template for Enscript. -+ * Author: Brent Fulgham -+ * (based on the Scheme version by Markku Rossi ) -+ */ -+ -+dylan_mod_re = -+/* Definition Modifiers -+ (build-re '(abstract block concrete constant class domain exception exclude -+ export function functional generic handler import inherited inline -+ instance interface library macro method open primary sealed sideways -+ singleton slot subclass variable virtual)) -+ */ -+ /\b(subclass|abstract|block|c(on(crete|stant)|lass)|domain\ -+|ex(c(eption|lude)|port)|f(unction(|al))|generic|handler\ -+|i(n(herited|line|stance|terface)|mport)|library|m(acro|ethod)\ -+|open|primary|sealed|si(deways|ngleton)|slot\ -+|v(ariable|irtual))\b/; -+ -+state dylan extends HighlightEntry -+{ -+ BEGIN { -+ /* -+ * Modify regexp character syntax so that we can distinguish all -+ * dylan symbols. -+ */ -+ extras = list ('!', '$', '%', '&', '*', '/', ':', -+ '=', '?', '~', '^', '.', '+', '-'); -+ for (i = 0; i < length (extras); i = i + 1) -+ regexp_syntax (extras[i], 'w'); -+ } -+ -+ /* Modifiers */ -+ dylan_mod_re { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* Types */ -+ /<\w+>/ { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Symbols */ -+ /#\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Comments. */ -+ /\/\// { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ /\/\*/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.*'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Keywords. -+ "=>" + -+ (build-re '(above afterwards begin below by case cleanup create -+ define end else elseif finally for from if in let local otherwise rename -+ select signal then to unless until use variable virtual when while -+ */ -+ /=>|\b(a(bove|fterwards)|b(e(gin|low)|y)|c(ase|leanup|reate)\ -+|define|else(|if)|end|f(inally|or|rom)|i[fn]|l(et|ocal)|otherwise\ -+|rename|s(elect|ignal)|t(hen|o)|u(n(less|til)|se)|wh(en|ile))\b/ { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* ':'-names, Emacs highlights these, so do we. */ -+ /([ \t])([!\$%&\*\/:<=>\?~_^a-zA-Z0-9.+\-]*:)/ { -+ language_print ($1); -+ reference_face (true); -+ language_print ($2); -+ reference_face (false); -+ } -+ -+ /* Function faces */ -+ /([ \t]*)(\w+[^:])([ \t]*\([ \t]*)/ { -+ language_print ($1); -+ function_name_face(true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face(false); -+ language_print ($3); -+ } -+} -+ -+ -+/* -+Local variables: -+mode: c -+End: -+*/ -diff -up enscript-1.6.5.1/states/hl/eiffel.st.hilight enscript-1.6.5.1/states/hl/eiffel.st ---- enscript-1.6.5.1/states/hl/eiffel.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/eiffel.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,132 @@ -+/** -+ * Name: eiffel -+ * Description: Eiffel programming language. -+ * Author: Julien Lemoine -+ * Brent Fulgham -+ */ -+ -+eiffel_types = -+/* Types */ -+ /\b(ABSTRACT_(FRACTION|INTEGER)|ANY|AR(GUMENTS|RAY(|2|3|ED_COLLECTION))\ -+|BASIC_(DIRECTORY|TIME)|BINARY_FILE_(READ|WRITE)|BIT_(N|STRING)|BOOLEAN\ -+|CHARACTER(|_CONSTANTS)|CLOCK|COLLECTION(|2|3|_SORTER)|COMPARABLE\ -+|COUNTER|DICTIONARY(|_NODE)|D(IRECTORY|OUBLE)|EXCEPTIONS|FILE(|_TOOLS)\ -+|FIXED_ARRAY(|2|3)|GE(NERAL|N_RAND)|HASH(ABLE|_TABLE_SIZE)|INPUT_STREAM\ -+|INTEGER(|_8|_16|_32|_64|_FRACTION|_GENERAL)\ -+|ITERATOR(|_ON_(COLLECTION|DICTIONARY(_ITEMS|_KEYS)|LINKED_LIST|SET\ -+|STRING|TWO_WAY_LINKED_LIST|UNICODE_STRING))\ -+|LARGE(|_NEGATIVE|_POSITIVE)_INTEGER|LINK(|2|ED(_COLLECTION|_LIST))\ -+|MATH_CONSTANTS|MEMO(|RY)|MICROSECOND_TIME|MINI_PARSER_BUFFER\ -+|MIN_STAND|MUTABLE_BIG_INTEGER|NATIVE_ARRAY|NULL_(INPUT|OUTPUT)\ -+|NUMBER(|_FRACTION|_TOOLS)|NUMERIC|OUTPUT_STREAM|PLATFORM|POINTER\ -+|REAL|REVERSE_COLLECTION_SORTER|SAFE_EQUAL|SCOOP_UTILITIES|SET(|_NODE)\ -+|SMALL_INTEGER|STD_(ERROR|FILE_(READ|READ_WRITE|WRITE)|INPUT(|_OUTPUT)\ -+|OUTPUT|RAND)|STRING(|_HANDLER)|SYSTEM|TIME(|_IN_(ENGLISH|FRENCH|GERMAN\ -+|ITALIAN|SOME_LANGUAGE|SPANISH))|TWO_WAY_LINKED_LIST\ -+|UNICODE_STRING(|_HANDLER)|UTF8_PARSER)\b/; -+ -+eiffel_keywords = -+/* Keywords */ -+ /\b(agent|a(ll|lias)|and|as(|sign)|check|class|convert|create|Current|debug\ -+|deferred|do|else(|if)|en(d|sure)|ex(panded|port|ternal)|False\ -+|feature|fro(m|zen)|if|implies|in(dexing|fix|herit|spect|variant)\ -+|is|like|local|loop|not|o(r|bsolete|ld|nce)|prefix|Precursor|pure\ -+|re(define|ference|name|quire|scue|try)|Result|separate|then|True\ -+|TUPLE|un(define|til)|creation)\b/; -+ -+state eiffel extends HighlightEntry -+{ -+ -+ /* One line comments. */ -+ /\-\-/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ eiffel_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ eiffel_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /:=|==|<=|>=|=|!=|\/=|!|!!/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* Type declarations */ -+ /([ \t])*([a-zA-Z]+[, \ta-zA-Z0-9_]*):[^=]/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /^([ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*)(\([ \t]*[ \ta-z,A-Z_0-9]+)(:[ \ta-zA-Z0-9_\[\]]+)?(\)[ \t]*)(:[ \ta-zA-Z0-9_\[\]]+)?([ \t]+is)[ \t]*$/ { -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($1); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($2); -+ type_face (true); -+ language_print ($3); -+ type_face (false); -+ language_print ($4); -+ type_face (true); -+ language_print ($5); -+ type_face (false); -+ keyword_face (true); -+ language_print ($6); -+ keyword_face (false); -+ language_print ($7); -+ } -+ -+ /* -+ * Function definitions, without args -+ * fct_name is -+ */ -+ /^([ \t]*[a-zA-Z_][a-zA-Z_0-9]*)([ \t]*)(is)[ \t]*$/ { -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($1); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print(" "); -+ keyword_face (true); -+ language_print ($3); -+ keyword_face (false); -+ } -+ -+} -diff -up enscript-1.6.5.1/states/hl/enscript.st.hilight enscript-1.6.5.1/states/hl/enscript.st ---- enscript-1.6.5.1/states/hl/enscript.st.hilight 2009-12-28 00:57:12.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/enscript.st 2010-05-20 15:28:08.148580599 +0200 -@@ -472,24 +472,31 @@ namerules - /\.m$/ matlab; - /\.(mpl|mp|maple)$/ maple; - /\.(scm|scheme)$/ scheme; -+ /\.e$/ eiffel; -+ /\.erl$/ erlang; - /\b\.emacs$|\.el$/ elisp; - /\.ad(s|b|a)$/ ada; - /\.[Ss]$/ asm; -+ /\.sml$/ sml; - /\.st$/ states; -+ /\.lua$/ lua; - /(M|m)akefile.*/ makefile; - /\.(MOD|DEF|mi|md)$/ modula_2; -+ /\.oz$/ oz; - /\.tcl$/ tcl; - /\.(v|vh)$/ verilog; -- /\.html?$/ html; -+ /\.x?html?$/ html; - /\bChangeLog$/ changelog; - /\.(vhd|vhdl)$/ vhdl; - /\.(scr|.syn|.synth)$/ synopsys; - /\.idl$/ idl; - /\.(hs|lhs|gs|lgs)$/ haskell; - /\.(pm|pl)$/ perl; -+ /\.php[34]?$/ php; - /\.(eps|EPS|ps|PS)$/ postscript; - /\.py$/ python; - /\.pyx$/ pyrex; -+ /\.rbw?$/ ruby; - /\.js$/ javascript; - /\.java$/ java; - /\.([Pp][Aa][Ss]|[Pp][Pp]|[Pp])$/ pascal; -@@ -529,6 +536,10 @@ startrules - /-\*- [Ii][Dd][Ll] -\*-/ idl; - /-\*- [Pp][Ee][Rr][Ll] -\*-/ perl; - /^#![ \t]*\/.*\/perl/ perl; -+ /-\*- [Pp][Hh][Pp] -\*-/ php; -+ /^<\?php/ php; -+ /-\*- [Rr][Uu][Bb][Yy] -\*-/ ruby; -+ /^#![ \t]*\/.*\/ruby/ ruby; - /^From:/ mail; - /^#![ \t]*(\/usr)?\/bin\/[ngmt]?awk/ awk; - /^#![ \t]*(\/usr)?\/bin\/sh/ sh; -diff -up enscript-1.6.5.1/states/hl/erlang.st.hilight enscript-1.6.5.1/states/hl/erlang.st ---- enscript-1.6.5.1/states/hl/erlang.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/erlang.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,161 @@ -+/** -+ * Name: erlang -+ * Description: Erlang programming language. -+ * Author: Sean Hinde -+ */ -+ -+ -+/* Erlang atom: ([a-z][a-zA-Z0-9_]*|\'[^\n]*\') */ -+ -+state erlang extends HighlightEntry -+{ -+ /* Comments */ -+ /%/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Special -record(rec_name, {}). pre-processor case */ -+ /(-record)(\([ \t]*)([a-z][a-zA-Z0-9_]*|\'[^\n]*\')/ { -+ reference_face (true); -+ language_print ($1); -+ reference_face (false); -+ language_print ($2); -+ type_face (true); -+ language_print ($3); -+ type_face (false); -+ } -+ -+ /* Special -define(Alter, "Hello"). pre-processor case */ -+ /(-define)(\([ -+\t]*)([a-z][a-zA-Z0-9_]*|\'[^\n]*\'|[A-Z_][a-zA-Z0-9_]*)/ { -+ reference_face (true); -+ language_print ($1); -+ reference_face (false); -+ language_print ($2); -+ builtin_face (true); -+ language_print ($3); -+ builtin_face (false); -+ } -+ -+ /* Pre-processor lines. */ -+ /^-([a-z][a-zA-Z0-9_]*)/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* Defines */ -+ /(\?)([a-z][a-zA-Z0-9_]*|\'[^\n]*\'|[A-Z_][a-zA-Z0-9_]*)/ { -+ language_print ($1); -+ builtin_face (true); -+ language_print ($2); -+ builtin_face (false); -+ } -+ -+ /* Records */ -+ /(#)([a-z][a-zA-Z0-9_]*|\'[^\n]*\')/ { -+ language_print ($1); -+ type_face (true); -+ language_print ($2); -+ type_face (false); -+ } -+ -+ /* Keywords. -+ '(after begin case try catch end fun if of receive when) -+ Regexp taken from emacs Erlang mode R9C -+ */ -+ /\b(a(fter|ndalso)|begin|c(atch|ase)\ -+|end|fun|if|o(f|relse)|receive|try|when\ -+|query)\b/ { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Guards. -+ Regexp taken from emacs Erlang mode R9C -+ */ -+ /\b((is_)*(atom|function|binary|constant|float\ -+|integer|list|number|p(id|ort)\ -+|re(ference|cord)|tuple))\b/ { -+ builtin_face (true); -+ language_print ($0); -+ builtin_face (false); -+ } -+ -+ /* Built in functions */ -+ -+/\b(a(bs|live|pply|tom_to_list)\ -+|binary_to_(list|term)\ -+|concat_binary|d(ate|isconnect_node)\ -+|e(lement|rase|xit)\ -+|float(|_to_list)\ -+|g(arbage_collect|et(|_keys)|roup_leader)\ -+|h(alt|d)\ -+|i(nte(ger_to_list|rnal_bif)|s_alive)\ -+|l(ength|i(nk|st_to_(atom|binary|float|integer\ -+|pid|tuple)))\ -+|make_ref|no(de(|_(link|unlink)|s)|talive)\ -+|open_port\ -+|p(id_to_list|rocess(_(flag|info)|es)|ut)\ -+|r(egister(|ed)|ound)\ -+|s(e(lf|telement)|ize\ -+|p(awn(|_link)|lit_binary)|tatistics)\ -+|t(erm_to_binary|hrow|ime|l\ -+|r(ace|unc)|uple_to_list)\ -+|un(link|register)|whereis)\b/ { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* -+ * Function definitions. -+ */ -+ /^([a-z][a-zA-Z0-9_]*|'[^\n]*')/ { -+ function_name_face (true); -+ language_print ($1); -+ function_name_face (false); -+ language_print ($2); -+ } -+ -+ /* Atom like strings */ -+ /('[^\n]*')/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Characters */ -+ /(\$.)/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Variable Names */ -+ /* /([\{\(\,\[ \t]+)([A-Z_][a-zA-Z0-9_]*)/ { */ -+ /([^a-z0-9_\"])([A-Z_][a-zA-Z0-9_]*)/ { -+ language_print ($1); -+ variable_name_face (true); -+ language_print ($2); -+ variable_name_face (false); -+ } -+} -+ -+/* -+Local variables: -+mode: erlang -+End: -+*/ -diff -up enscript-1.6.5.1/states/hl/forth.st.hilight enscript-1.6.5.1/states/hl/forth.st ---- enscript-1.6.5.1/states/hl/forth.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/forth.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,96 @@ -+/** -+ * Name: forth -+ * Description: Forth Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+forth_builtins = -+/* builtins */ -+ /\b(abort|bye|c(atch|o(ld|ntext))|d(rop|up)|f(d(rop|up)|nip|o(r(get|th)|ver)|rot\ -+|s(eal|wap)|tuck)|include|l(ink|oad)|n(ip|eeds)|o(rder|ver)|pick|ro(ll|t)|swap|t(hrow|uck)\ -+|within|2(drop|nip|dup|over|tuck|swap|rot)|3dup|4dup\ -+)\b/; -+ -+forth_types = -+/* types */ -+ /\b(base|c(ell|har)|decimal|float|hex)\b/; -+ -+forth_keywords = -+/* keywords */ -+ /\b(a(bs|gain|head|lso|nd)|begin|c(ase|onstant)|d(abs|efinitions|m(ax|in)|negate|o(|ne))\ -+|e(lse|nd(|case|if|of)|xit)|f(a(bs|cos(|h)|log|sin(|h)|tan(|2|h))|cos(|h)|exp(|m1)|l(n(|p1)\ -+|o(g|or)|s(in(|cos|h)|qrt)|tan(|h))|m(ax|in)|negate|or|round|sqrt)|h(ere|old)|i(f|nvert)\ -+|l(eave|oop)|m(ax|in|od)|n(e(gate|xt)|ot)|o(f|nly|r)|r(epeat|oot)|s(eal|ign)|then\ -+|un(til|loop)|v(ariable|oc(abulary|s))|while|xor\ -+)\b/; -+ -+state forth extends HighlightEntry -+{ -+ /* Comments. */ -+ /\\\\/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* keywords. */ -+ forth_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ forth_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Builtins support */ -+ forth_builtins { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* symbols, etc. */ -+ />|>=|<=|<>|!|\+|\-|\^|\/|\*|\|/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * function definitions, with args -+ * fct_name (args...) is -+ */ -+ /^(:[ \t]+)([^ ^\t]+)([ \t]*)/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+} -+ -diff -up enscript-1.6.5.1/states/hl/icon.st.hilight enscript-1.6.5.1/states/hl/icon.st ---- enscript-1.6.5.1/states/hl/icon.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/icon.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,93 @@ -+/** -+ * Name: icon -+ * Description: Icon Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+icon_builtins = -+/* Builtins */ -+ /\b(break|create|default|fail|initial|l(ink|ocal)|not|s(tatic|uspend))\b/; -+ -+icon_types = -+/* Types */ -+ /\b(char|error|function|integer|proc|procedure|real|variable)\b/; -+ -+icon_keywords = -+/* Keywords */ -+ /\b(a(bs|cos|ny|rgs|sin|tan)|b(al|y)|c(a(llout|se)|enter|hdir|lose|o(llect|py|s)|set)\ -+|d(e(lay|lete|tab|isplay|tor)|o)|e(lse|n(d|tab)|rrorclear|very|xit|xp)|f(ind|lush)\ -+|get(|ch|che|env)|i(and|com|f|mage|nsert|or|shift|xor)|k(bhit|ey)|l(eft|ist|o(adfunc|g))\ -+|m(a(ny|p|tch)|ember|ove)|n(ame|ext|umeric)|o(f|pen|rd)|p(op|os|ull|ush|ut)\ -+|r(e(ad(|s)|move|name|p(eat|l)|turn|verse)|ight|tod|unerr)|s(ave|eek|eq|et|in|ort(|f)\ -+|qrt|top|tring|ystem)|t(a(b(|le)|n)|hen|o|rim|ype)|u(ntil|pto)|w(h(ere|ile)|rite(|s))\ -+)\b/; -+ -+state icon extends HighlightEntry -+{ -+ /* Comments. */ -+ /#/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ icon_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ icon_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Structure support */ -+ icon_builtins { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ />|>=|:=|<=|#|=+|!|::|\+|\-|\^|\/|\*|\|/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /([ \t]*procedure[ \t]+)(\w+)([ \t]*)/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+} -diff -up enscript-1.6.5.1/states/hl/lua.st.hilight enscript-1.6.5.1/states/hl/lua.st ---- enscript-1.6.5.1/states/hl/lua.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/lua.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,91 @@ -+/** -+ * Name: lua -+ * Description: Lua Programming Language template for Enscript. -+ * Author: Brent Fulgham -+ */ -+ -+lua_builtins = -+/* Builtins */ -+ /\b(assert|call|foreach|globals|print|require|to(number|string))\b/; -+ -+lua_keywords = -+/* Keywords */ -+ /\b(and|break|do|e(nd|lse(|if))|f(alse|or|unction)|i(f|n)|local\ -+|or|n(il|ot)|re(peat|turn)|t(hen|rue)|until|while\ -+)\b/; -+ -+state lua extends HighlightEntry -+{ -+ -+ /* One line comments. */ -+ /\-\-|^#!/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ lua_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ lua_builtins { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /+|-|\*|=|!=|==|<|>|<=|>=|~=|!/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* Class references */ -+ /([ \t])*([a-zA-Z]+[, \ta-zA-Z0-9_]*):[^=]/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * function fct_name (args...) -+ */ -+ /^([ \t]*function[ \t]+)([a-zA-Z_][a-zA-Z_:0-9]*)([ \t]*)(\([^)]*\)[ \t]*)[ \t]*$/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print(" "); -+ language_print ($3); -+ keyword_face (true); -+ language_print ($4); -+ keyword_face (false); -+ } -+ -+} -diff -up enscript-1.6.5.1/states/hl/mail.st.hilight enscript-1.6.5.1/states/hl/mail.st ---- enscript-1.6.5.1/states/hl/mail.st.hilight 2009-01-24 21:59:34.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/mail.st 2010-05-20 15:28:08.148580599 +0200 -@@ -27,7 +27,7 @@ state mail_header extends Highlight - END { - comment_face (true); - } -- /:/ { -+ /[ \t:]/ { - language_print ($0); - return; - } -diff -up enscript-1.6.5.1/states/hl/Makefile.am.hilight enscript-1.6.5.1/states/hl/Makefile.am ---- enscript-1.6.5.1/states/hl/Makefile.am.hilight 2010-03-06 13:59:56.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/Makefile.am 2010-05-20 15:29:46.656051228 +0200 -@@ -36,9 +36,10 @@ idl.st inf.st java.st javascript.st ksh. - matlab.st nroff.st objc.st outline.st pascal.st passthrough.st perl.st \ - postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st \ - sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st \ --vhdl.st vrml.st wmlscript.st zsh.st -+vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \ -+lua.st oberon2.st icon.st smalltalk.st forth.st sml.st php.st ruby.st - - hldir = $(pkgdatadir)/hl - dist_hl_DATA = $(misc) $(styles) $(languages) $(highlightings) - --EXTRA_DIST = ChangeLog.old -\ No newline at end of file -+EXTRA_DIST = ChangeLog.old -diff -up enscript-1.6.5.1/states/hl/oberon2.st.hilight enscript-1.6.5.1/states/hl/oberon2.st ---- enscript-1.6.5.1/states/hl/oberon2.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/oberon2.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,111 @@ -+/** -+ * Name: oberon2 -+ * Description: Oberon 2 Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+oberon2_builtins = -+/* Builtins */ -+ /\b(CONST|IMPORT)\b/; -+ -+oberon2_types = -+/* Types */ -+ /\b(ARRAY|B(OOLEAN|YTE)|CHAR|INTEGER|LONG(|INT|REAL)|MODULE|NIL\ -+|P(OINTER|ROCEDURE)|RE(AL|CORD)|SHORT(|INT))\b/; -+ -+oberon2_keywords = -+/* Keywords */ -+ /\b(A(BS|ND|SH)|BEGIN|C(A(P|SE)|HR)|D(O|EC|IV)\ -+|E(LS(E|IF)|N(D|TIER)|X(CL|IT))|F(ALSE|OR)|HALT|I(F|S|N(|C(|L)))\ -+|L(EN|OOP)|M(AX|IN|OD)|NEW|O(F|DD|R(|D))|S(ET|IZE)|T(HEN|O|RUE|YPE)\ -+|UNTIL|RE(PEAT|TURN)|VAR|W(HILE|ITH))\b/; -+ -+state oberon2_comment extends Highlight -+{ -+ /\*\)/ { -+ language_print ($0); -+ return; -+ } -+} -+ -+state oberon2 extends HighlightEntry -+{ -+ /* Comments. */ -+ /\(\*/ { -+ comment_face (true); -+ language_print ($0); -+ call (oberon2_comment); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ oberon2_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ oberon2_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Structure support */ -+ oberon2_builtins { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /\->|>|>=|:=|<=|#|=|!|::|\+|\-|\^|\/|\*|\|/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /([ \t]*PROCEDURE[ \t]+)(\w+)([ \t]*)/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+ -+ /([ \t]*END[ \t]+)(\w+)([ \t]*[;\.])/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+} -diff -up enscript-1.6.5.1/states/hl/oz.st.hilight enscript-1.6.5.1/states/hl/oz.st ---- enscript-1.6.5.1/states/hl/oz.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/oz.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,89 @@ -+/** -+ * Name: oz -+ * Description: Mozart/Oz Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+oz_builtins = -+/* Builtins */ -+ /\b(export|import|local|require)\b/; -+ -+oz_types = -+/* Types */ -+ /\b(attr|c(lass|atch)|f(eat|unctor)|nil|prop|raise|try)\b/; -+ -+oz_keywords = -+/* Keywords */ -+ /\b(at|c(ase|hoice|ond)|d(e(clare|fine)|o|is)|e(lse(|case|if|of)|nd)\ -+|f(inally|or|rom|un)|i(f|n)|lock|meth|not|o(f|r)|p(repare|roc)|then\ -+|thread)\b/; -+ -+state oz extends HighlightEntry -+{ -+ -+ /* Comments. */ -+ /%/ { -+ comment_face (true); -+ language_print ($0); -+ call (eat_one_line); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ oz_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ oz_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Structure support */ -+ oz_builtins { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /\.\.|=[=]|<\-|\\=|\|/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /([ \t]*\{)(\w+)([\. \t]*)/ { -+ language_print ($1); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+ -+} -diff -up enscript-1.6.5.1/states/hl/perl.st.hilight enscript-1.6.5.1/states/hl/perl.st ---- enscript-1.6.5.1/states/hl/perl.st.hilight 2009-01-24 21:59:34.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/perl.st 2010-05-20 15:28:08.148580599 +0200 -@@ -60,6 +60,11 @@ state perl_bquot_string extends Highligh - - state perl extends HighlightEntry - { -+ /* stuff after $# is a variable, not a comment */ -+ /\$#\w+/ { -+ language_print ($0); -+ } -+ - /* Comments. */ - /#.*$/ { - comment_face (true); -@@ -127,7 +132,6 @@ state perl extends HighlightEntry - - /* Variables */ - /[$%@&]+\w+/ { -- keyword_face (false); - language_print ($0); - } - -diff -up enscript-1.6.5.1/states/hl/smalltalk.st.hilight enscript-1.6.5.1/states/hl/smalltalk.st ---- enscript-1.6.5.1/states/hl/smalltalk.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/smalltalk.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,80 @@ -+/** -+ * Name: Smalltalk -+ * Description: Smalltalk Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+smalltalk_keywords = -+/* Keywords */ -+ /\b(class|false|inspect|isNil|new|nil|not(|Nil)|out|s(elf|uper)|true\ -+|do|whileTrue|whileFalse|ifTrue|ifFalse|put|to|at|add|new\ -+|for)\b/ ; -+ -+state smalltalk_quot_string extends Highlight -+{ -+ /\\\\./ { -+ language_print ($0); -+ } -+ /[\']/ { -+ language_print ($0); -+ return; -+ } -+} -+ -+state smalltalk extends HighlightEntry -+{ -+ -+ /* Comments. */ -+ /\"/ { -+ comment_face (true); -+ language_print ($0); -+ call (c_string); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ smalltalk_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Declarations */ -+ /[ \t]*\|.*\|/ { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* String constants. */ -+ /[\']/ { -+ string_face (true); -+ language_print ($0); -+ call (smalltalk_quot_string); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /:=|>|>=|==|<=|<>|=|!|::|@|\+|\-|\^|\/|\*|\||\[|\]/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /([ \t]*)(\w+)(:[ \t]*)/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold); -+ language_print ($2); -+ face_off(face_bold); -+ function_name_face (false); -+ language_print ($3); -+ } -+ -+} -diff -up enscript-1.6.5.1/states/hl/sml.st.hilight enscript-1.6.5.1/states/hl/sml.st ---- enscript-1.6.5.1/states/hl/sml.st.hilight 2010-05-20 15:28:08.148580599 +0200 -+++ enscript-1.6.5.1/states/hl/sml.st 2010-05-20 15:28:08.148580599 +0200 -@@ -0,0 +1,101 @@ -+/** -+ * Name: sml -+ * Description: Standard ML Programming Language. -+ * Author: Brent Fulgham -+ */ -+ -+sml_builtins = -+/* Builtins */ -+ /\b(functor|lambda|s(ig(|nature)|truct(|ure))|NONE|SOME)\b/; -+ -+sml_types = -+/* Types */ -+ /\b(\'(a|b|c|d)|array|bool|char|int|list|real|string|unit|vector|word)\b/; -+ -+sml_keywords = -+/* Keywords */ -+ /\b(a(bs(traction|type)|nd(|also)|s|toi)|before|c(ase|oncat)|d(o|atatype)\ -+|e(lse|nd|qtype|xception)|f(n|un(|sig))|handle|i(f|n(|clude|fix|fixr))\ -+|l(et|ocal)|nonfix|o(|f|p(|en)|relse|verload)|print|r(aise|ec|ef)|sharing\ -+|t(hen|ype)|val|w(h(ere|ile)|ith(|type)))\b/ ; -+ -+state sml_comment extends Highlight -+{ -+ /\*\)/ { -+ language_print ($0); -+ return; -+ } -+} -+ -+state sml extends HighlightEntry -+{ -+ -+ /* Comments. */ -+ /\(\*/ { -+ comment_face (true); -+ language_print ($0); -+ call (sml_comment); -+ comment_face (false); -+ } -+ -+ /* Keywords. */ -+ sml_keywords { -+ keyword_face (true); -+ language_print ($0); -+ keyword_face (false); -+ } -+ -+ /* Types. */ -+ sml_types { -+ type_face (true); -+ language_print ($0); -+ type_face (false); -+ } -+ -+ /* Structure support */ -+ sml_builtins { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* String constants. */ -+ /\"/ { -+ string_face (true); -+ language_print ($0); -+ call (c_string); -+ string_face (false); -+ } -+ -+ /* Character constants. */ -+ /'.'|'\\\\.'/ { -+ string_face (true); -+ language_print ($0); -+ string_face (false); -+ } -+ -+ /* Symbols, etc. */ -+ /:=|>|>=|==|<=|<>|=|!|::|@|\+|\-|\^|\/|\*|\||\b(quot|rem|div|mod\ -+|hd|tl)\b/ { -+ reference_face (true); -+ language_print ($0); -+ reference_face (false); -+ } -+ -+ /* -+ * Function definitions, with args -+ * fct_name (args...) is -+ */ -+ /([ \t]*f[u]n[ \t]+)(\w+)([ \t]*)/ { -+ keyword_face (true); -+ language_print ($1); -+ keyword_face (false); -+ function_name_face (true); -+ face_on(face_bold_italic); -+ language_print ($2); -+ face_off(face_bold_italic); -+ function_name_face (false); -+ language_print ($3); -+ } -+ -+} -diff -up enscript-1.6.5.1/states/hl/tcl.st.hilight enscript-1.6.5.1/states/hl/tcl.st ---- enscript-1.6.5.1/states/hl/tcl.st.hilight 2009-01-24 21:59:34.000000000 +0100 -+++ enscript-1.6.5.1/states/hl/tcl.st 2010-05-20 15:28:08.148580599 +0200 -@@ -128,7 +128,7 @@ state tcl extends HighlightEntry - |e(ntry|of|rror|v(al|ent)|x(ec|it|pr))\ - |f(blocked|configure|ile(|event|name)|lush|o(cus|nt|r(|each|mat))|rame)\ - |g(ets|lob(|al)|r(ab|id))|history|i(f|mage|n(cr|fo|terp))|join\ --|l(a(bel|ppend)|i(brary|n(dex|sert)|st(|box))|length|o(ad|se|wer)\ -+|l(a(bel|ppend|st)|i(brary|n(dex|sert)|st(|box))|length|o(ad|se|wer)\ - |r(ange|eplace)|s(earch|ort))\ - |me(nu(|button)|ssage)|op(en|tion(|s))\ - |p(ack(|age)|hoto|id|kg_mkIndex|lace|roc|uts|wd)\ diff --git a/enscript-1.6.4-rh457719.patch b/enscript-1.6.4-rh457719.patch deleted file mode 100644 index 450c4a5..0000000 --- a/enscript-1.6.4-rh457719.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up enscript-1.6.4/src/main.c.rh457719 enscript-1.6.4/src/main.c ---- enscript-1.6.4/src/main.c.rh457719 2008-08-08 11:23:27.000000000 +0200 -+++ enscript-1.6.4/src/main.c 2008-08-08 11:23:36.000000000 +0200 -@@ -2001,7 +2001,7 @@ handle_options (int argc, char *argv[]) - int i; - - c = getopt_long (argc, argv, -- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ", -+ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", - long_options, &option_index); - - if (c == -1) diff --git a/enscript-rh477382.patch b/enscript-rh477382.patch index 20fbe40..ccc4881 100644 --- a/enscript-rh477382.patch +++ b/enscript-rh477382.patch @@ -1,6 +1,6 @@ -diff -up enscript-1.6.5.1/afm/Makefile.am.rh477382 enscript-1.6.5.1/afm/Makefile.am ---- enscript-1.6.5.1/afm/Makefile.am.rh477382 2010-03-06 14:02:53.000000000 +0100 -+++ enscript-1.6.5.1/afm/Makefile.am 2010-05-21 13:09:28.000346827 +0200 +diff -up enscript-1.6.6/afm/Makefile.am.rh477382 enscript-1.6.6/afm/Makefile.am +--- enscript-1.6.6/afm/Makefile.am.rh477382 2012-09-20 00:17:34.000000000 +0200 ++++ enscript-1.6.6/afm/Makefile.am 2012-09-26 13:42:09.223974485 +0200 @@ -29,9 +29,12 @@ hvnbo.afm hvno.afm hvo.afm ncb.afm ncbi. pobi.afm poi.afm por.afm sy.afm tib.afm tibi.afm tii.afm tir.afm \ zcmi.afm zd.afm @@ -9,16 +9,16 @@ diff -up enscript-1.6.5.1/afm/Makefile.am.rh477382 enscript-1.6.5.1/afm/Makefile +public_fonts = matrix.afm matrix.eps afmdir = $(pkgdatadir)/afm - dist_afm_DATA = font.map $(default_afm) $(public_fonts) + dist_afm_DATA = font.map $(default_afm) $(public_fonts) MustRead.html EXTRA_DIST = ChangeLog.old + +matrix.eps: matrix.pfa + cp matrix.pfa matrix.eps -diff -up enscript-1.6.5.1/src/util.c.rh477382 enscript-1.6.5.1/src/util.c ---- enscript-1.6.5.1/src/util.c.rh477382 2009-12-28 00:57:12.000000000 +0100 -+++ enscript-1.6.5.1/src/util.c 2010-05-21 13:08:10.920347803 +0200 -@@ -1079,9 +1079,16 @@ download_font (char *name) +diff -up enscript-1.6.6/src/util.c.rh477382 enscript-1.6.6/src/util.c +--- enscript-1.6.6/src/util.c.rh477382 2011-10-30 17:48:42.000000000 +0100 ++++ enscript-1.6.6/src/util.c 2012-09-26 13:40:53.336866463 +0200 +@@ -1084,9 +1084,16 @@ download_font (char *name) buffer_append (&fname, ".pfb"); if (stat (buffer_ptr (&fname), &stat_st) != 0) { diff --git a/enscript.spec b/enscript.spec index f822321..3fed256 100644 --- a/enscript.spec +++ b/enscript.spec @@ -1,7 +1,7 @@ Summary: A plain ASCII to PostScript converter Name: enscript -Version: 1.6.5.2 -Release: 6%{?dist} +Version: 1.6.6 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Publishing URL: http://www.gnu.org/software/enscript @@ -14,15 +14,12 @@ Source1: enscript-ruby-1.6.4.tar.gz Source2: enscript-php-1.6.4.st #http://home.raxnet.net/downloads/viewcvs/php.st -# RH #177336 -Patch1: enscript-1.6.4-hilight.patch # RH #61294 Patch3: enscript-1.6.1-locale.patch # RH #224548 Patch8: enscript-wrap_header.patch -Patch9: enscript-1.6.4-rh457719.patch Patch10:enscript-1.6.4-rh457720.patch Patch12:enscript-rh477382.patch Requires(preun): /sbin/install-info @@ -43,10 +40,8 @@ includes many options for customizing printouts %prep %setup -q -%patch1 -p1 -b .hilight %patch3 -p1 -b .locale %patch8 -p1 -b .wrap_header -%patch9 -p1 -b .rh457719 %patch10 -p1 -b .rh457720 %patch12 -p1 -b .rh477382 @@ -109,6 +104,12 @@ fi %config(noreplace) %{_sysconfdir}/enscript.cfg %changelog +* Wed Sep 26 2012 Adam Tkac - 1.6.6-1 +- update to 1.6.6 +- paches merged + - enscript-1.6.4-hilight.patch + - enscript-1.6.4-rh457719.patch + * Wed Jul 18 2012 Fedora Release Engineering - 1.6.5.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 0e4d1f4..b3e48de 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ f3a0083638ac3fddc493d44b6515182a enscript-php-1.6.4.st fa9c837b2a258716411f6df827d36eb3 enscript-ruby-1.6.4.tar.gz -c1d2a0d4b44ca30634742b299881b0e2 enscript-1.6.5.2.tar.gz +3acc242b829adacabcaf28533f049afd enscript-1.6.6.tar.gz