diff --git a/.cvsignore b/.cvsignore index 55f6ed1..d85b5c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libkate-0.3.1.tar.gz +libkate-0.3.3.tar.gz diff --git a/libkate-0.3.1-noredef.patch b/libkate-0.3.1-noredef.patch deleted file mode 100644 index d741801..0000000 --- a/libkate-0.3.1-noredef.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libkate-0.3.1/tools/kate_parser.y.noredef libkate-0.3.1/tools/kate_parser.y ---- libkate-0.3.1/tools/kate_parser.y.noredef 2009-01-29 00:26:44.000000000 +0100 -+++ libkate-0.3.1/tools/kate_parser.y 2009-04-04 00:59:29.000000000 +0200 -@@ -1012,7 +1012,7 @@ static char *expand_numeric_entities(con - return newtext; - } - --static char *getline(const char **text) -+static char *getrawline(const char **text) - { - size_t rlen0; - int newline,in_newline=0; -@@ -1020,7 +1020,7 @@ static char *getline(const char **text) - int c; - - if (!text || !*text) { -- yyerror("error: getline passed invalid text pointer"); -+ yyerror("error: getrawline passed invalid text pointer"); - exit(-1); - } - -@@ -1126,7 +1126,7 @@ static char *trimtext(const char *text) - char *newtext=(char*)kate_malloc(1); - *newtext=0; - while (text && *text) { -- char *line=getline(&text); -+ char *line=getrawline(&text); - char *trimmed=trimline(line); - kate_free(line); - if (*trimmed && strcmp(trimmed,"\n")) { diff --git a/libkate-0.3.1-python_no_shebang.patch b/libkate-0.3.1-python_no_shebang.patch deleted file mode 100644 index 6a1df35..0000000 --- a/libkate-0.3.1-python_no_shebang.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py~ libkate-0.3.1/tools/KateDJ/kdj/constants.py ---- libkate-0.3.1/tools/KateDJ/kdj/constants.py~ 2009-03-15 00:25:09.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py 2009-04-10 12:58:10.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - kdj_name='KateDJ' - kdj_version='0.3.1' - kdj_name_version=kdj_name+' '+kdj_version -diff -up libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in ---- libkate-0.3.1/tools/KateDJ/kdj/constants.py.in~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/constants.py.in 2009-04-10 12:58:16.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - kdj_name='KateDJ' - kdj_version='@VERSION@' - kdj_name_version=kdj_name+' '+kdj_version -diff -up libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py ---- libkate-0.3.1/tools/KateDJ/kdj/demuxer.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/demuxer.py 2009-04-10 12:57:35.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import os - import tempfile -diff -up libkate-0.3.1/tools/KateDJ/kdj/finder.py~ libkate-0.3.1/tools/KateDJ/kdj/finder.py ---- libkate-0.3.1/tools/KateDJ/kdj/finder.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/finder.py 2009-04-10 12:57:20.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import os - -diff -up libkate-0.3.1/tools/KateDJ/kdj/muxer.py~ libkate-0.3.1/tools/KateDJ/kdj/muxer.py ---- libkate-0.3.1/tools/KateDJ/kdj/muxer.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/muxer.py 2009-04-10 12:57:16.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import os - -diff -up libkate-0.3.1/tools/KateDJ/kdj/options.py~ libkate-0.3.1/tools/KateDJ/kdj/options.py ---- libkate-0.3.1/tools/KateDJ/kdj/options.py~ 2009-01-02 22:13:25.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/options.py 2009-04-10 12:57:07.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import os - - class Options: -diff -up libkate-0.3.1/tools/KateDJ/kdj/tools.py~ libkate-0.3.1/tools/KateDJ/kdj/tools.py ---- libkate-0.3.1/tools/KateDJ/kdj/tools.py~ 2009-01-29 00:43:20.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/tools.py 2009-04-10 12:57:27.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import os - import subprocess -diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py ---- libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/ui_editor.py 2009-04-10 12:57:40.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import wx - #import wx.py.editor as editor -diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py ---- libkate-0.3.1/tools/KateDJ/kdj/ui_main.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/ui_main.py 2009-04-10 12:57:47.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import os - import wx -diff -up libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py ---- libkate-0.3.1/tools/KateDJ/kdj/ui_options.py~ 2009-01-02 19:58:46.000000000 +0100 -+++ libkate-0.3.1/tools/KateDJ/kdj/ui_options.py 2009-04-10 12:57:52.000000000 +0200 -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - import sys - import wx - from constants import * diff --git a/libkate.spec b/libkate.spec index ae85cfe..5af7796 100644 --- a/libkate.spec +++ b/libkate.spec @@ -1,16 +1,14 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: libkate -Version: 0.3.1 -Release: 3%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Libraries to handle the Kate bitstream format Group: System Environment/Libraries License: BSD URL: http://code.google.com/p/libkate/ Source0: http://libkate.googlecode.com/files/libkate-%{version}.tar.gz -Patch0: libkate-0.3.1-noredef.patch -Patch1: libkate-0.3.1-python_no_shebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -56,10 +54,6 @@ The %{name}-utils package contains the katedec/kateenc binaries for %{name}. %prep %setup -q -#Prevent conflict with GNU getline() in recent rawhide -%patch0 -p1 -b .noredef -#Remove shebangs -%patch1 -p1 -b .noshebangs # We regenerate theses files at built step rm tools/kate_parser.{c,h} @@ -128,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 11 2009 kwizart < kwizart at gmail.com > - 0.3.3-1 +- Update to 0.3.3 + * Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 0.3.1-3 - Use Fedora compliant (using version) _docdir directory. - Remove shebangs when not needed. diff --git a/sources b/sources index da92b01..d0f6ac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d94894c5b6f12c0a5fed34307a32bb9d libkate-0.3.1.tar.gz +328ea1eb451f460514a096668d3bf076 libkate-0.3.3.tar.gz