From ef1d7517edbf64b48a7024a78b8832f97a873e6d Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Nov 26 2013 16:29:10 +0000
Subject: Use of correct tar ball should fix BZ #10341741)


---

diff --git a/.gitignore b/.gitignore
index e4e1cc4..36bfb9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ highlight-3.1-beta2.tar.bz2
 /highlight-3.13.tar.bz2
 /highlight-3.15.tar.bz2
 /highlight-3.16.tar.bz2
+/highlight-3.16.1.tar.bz2
diff --git a/highlight.spec b/highlight.spec
index f770cc2..1fe9d02 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -3,15 +3,13 @@ Name:           highlight
 Summary:        Universal source code to formatted text converter
 
 Version:        3.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Development/Tools
 License:        GPLv3
 
 URL:            http://www.andre-simon.de/
-# Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-Source0:        http://www.andre-simon.de/zip/%{name}-3.16.tar.bz2
-Source1:        http://andre-simon.de/zip/sh.lang
+Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
 BuildRequires:  qt-devel >= 1:4.4
 BuildRequires:  lua-devel, boost-devel
@@ -41,7 +39,6 @@ A Qt-based GUI for the highlight source code formatter source.
 
 %prep
 %setup -q -n  %{name}-3.16
-cp -p %{SOURCE1} langdefs
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -81,6 +78,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Tue Nov 26 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.16.1-2
+- Use of correct tar ball should fix BZ #10341741)
+
 * Fri Nov  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.16.1-1
 - Minor bug fix release from upstream
 
diff --git a/sh.lang b/sh.lang
deleted file mode 100644
index e686c92..0000000
--- a/sh.lang
+++ /dev/null
@@ -1,82 +0,0 @@
--- FIXME omitted definition of $KEYWORDS(KWB)
--- Language definition generated by lang2to3
-
-Description="Bash"
-
-Identifiers=[[ [a-zA-Z_][\w\-]* ]]
-
-Keywords={
-  { Id=1,
-    List={"case", "in", "esac", "for", "do", "done", "function", "if", "then",
-"fi", "elif", "else", "select", "time", "until", "while"},
-  },
-  { Id=2,
-    List={"source", "alias", "bind", "break", "builtin", "command", "continue",
-"declare", "dirs", "disown", "echo", "enable", "export", "fc", "fg", "getopts",
-"hash", "help", "history", "jobs",  "let", "local", "logout", "popd", "printf",
-"pushd", "pwd", "read", "readonly", "return", "set",  "shift", "shopt",
-"suspend", "test", "times", "trap", "type", "ulimit", "umask", "unalias",
-"unset", "wait", "eval", "bg", "cd", "echo", "eval", "exec", "exit", "kill",
-"read", "set", "test", "trap", "ulimit", "umask", "wait"},
-  },
-  { Id=3,
-    List={"ls", "cat", "tac", "rev", "cp", "mv", "rm", "rmdir", "chmod",
-"chattr", "ln", "find", "xargs", "expr", "date", "zdump", "time", "touch", "at",
-"batch", "cal", "sleep", "usleep", "hwclock", "clock", "sort", "tsort", "diff",
-"patch", "diff3", "sdiff", "cmp", "comm", "uniq", "expand", "unexpand", "cat",
-"paste", "join", "head", "tail", "grep", "egrep", "zgrep", "look", "sed", "awk",
-"wc", "tr", "fold", "fmt", "ptx", "col", "column", "colrm", "nl", "pr",
-"gettext", "iconv", "recode", "groff", "lex", "yacc", "tar", "shar", "ar",
-"cpio", "gzip", "bzip2", "compress", "uncompress", "zip", "unzip", "sq", "file",
-"which", "whereis", "whatis", "vdir", "shred", "locate", "slocate", "strings",
-"basename", "dirname", "split", "sum", "cksum", "md5sum", "sha1sum", "uuencode",
-"uudecode", "crypt", "make", "install", "more", "less", "host", "vrfy",
-"nslookup", "dig", "traceroute", "ping", "whois", "finger", "ftp", "uucp",
-"telnet", "rlogin", "rsh", "rcp", "ssh", "write", "mail", "vacation", "tput",
-"reset", "clear", "script", "factor", "bc", "dc", "jot", "seq", "yes", "banner",
-"printenv", "lp", "tee", "mkfifo", "pathchk", "dd", "od", "hexdump", "m4"},
-  },
-  --{ Id=3,
-  --  Regex=[[(\w+)\s*\(]]
-  --},
-  { Id=4,
-    Regex=[[\$\{.+?\}]],
-  },
-  { Id=4,
-    Regex=[[ \$[\w\#]+ ]],
-  },
-}
-
--- hereDoc opening delimiter, see OnStateChange to handle end of string
-Strings={
-  Delimiter=[["|'|`|<<[\-"']?\s*[-\w_]+["']?]],
-}
-
-IgnoreCase=false
-
-Comments={
-  { Block=false,
-    Delimiter= { [[#]] },
-  },
-}
-
-Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\:|\&|<|>|\!|\=|\/|\*|\%|\+|\-]]
-
-
-function OnStateChange(oldState, newState, token)
-
-   if  (string.sub(token,1,1) =="$" )  and oldState==HL_STRING and newState==HL_KEYWORD then
-      return HL_INTERPOLATION
-   end
-
-   --recognize hereDoc multine strings
-   if oldState==HL_STANDARD and newState==HL_STRING and not string.find("\"'`", token) then
-      hereDoc = string.match(token, "<<%-?'?%s*([%-%a%d_]+)" )
-   end
-   if oldState==HL_STRING and token==hereDoc then
-      hereDoc = nil
-      return HL_STRING_END
-   end
-   
-   return newState
-end
\ No newline at end of file
diff --git a/sources b/sources
index d1bfd94..a3f88a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88558766efc5109f07b7f5b78e62aea2  highlight-3.16.tar.bz2
+688bb537db149dc720b9ef1ffc796ced  highlight-3.16.1.tar.bz2