rpms/libkate/F-9 import.log, NONE, 1.1 libkate-0.3.1-noredef.patch, NONE, 1.1 libkate-0.3.1-python_no_shebang.patch, NONE, 1.1 libkate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Nicolas Chauvet kwizart at fedoraproject.org
Fri Apr 10 23:24:59 UTC 2009


Author: kwizart

Update of /cvs/pkgs/rpms/libkate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28918/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libkate-0.3.1-noredef.patch 
	libkate-0.3.1-python_no_shebang.patch libkate.spec 
Log Message:
Initial import for F-9



--- NEW FILE import.log ---
libkate-0_3_1-3_fc11:F-9:libkate-0.3.1-3.fc11.src.rpm:1239405199

libkate-0.3.1-noredef.patch:

--- NEW FILE libkate-0.3.1-noredef.patch ---
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")) {

libkate-0.3.1-python_no_shebang.patch:

--- NEW FILE libkate-0.3.1-python_no_shebang.patch ---
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 *


--- NEW FILE libkate.spec ---
%{!?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}
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
BuildRequires:  libogg-devel
BuildRequires:  liboggz
BuildRequires:  libpng-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  valgrind
BuildRequires:  doxygen
 

%description
This is libkate, the reference implementation of a codec for the Kate bitstream
format.
Kate is a karaoke and text codec meant for encapsulation in an Ogg container.
It can carry text, images, and animate them.

Kate is meant to be used for karaoke alongside audio/video streams (typically
Vorbis and Theora), movie subtitles, song lyrics, and anything that needs text
data at arbitrary time intervals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libogg-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package utils
Summary:        Encoder/Decoder utilities for %{name}
Group:          Applications/Multimedia
Requires:       %{name} = %{version}-%{release}
Requires:       liboggz

%description utils
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}
rm tools/kate_lexer.c


%build
%configure --disable-static \
  --docdir=%{_docdir}/%{name}-%{version}

# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Fix for header timestramps
touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h \
 $RPM_BUILD_ROOT%{_includedir}/kate/kate.h


%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%exclude %{_docdir}/libkate-%{version}/html
%doc %{_docdir}/libkate-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/
%doc %{_docdir}/libkate-%{version}/html
%{_includedir}/kate/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%files utils
%defattr(-,root,root,-)
%{python_sitelib}/kdj/
%{_bindir}/KateDJ
%{_bindir}/katalyzer
%{_bindir}/katedec
%{_bindir}/kateenc
%{_mandir}/man1/KateDJ.*
%{_mandir}/man1/katalyzer.*
%{_mandir}/man1/katedec.*
%{_mandir}/man1/kateenc.*


%changelog
* 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.
- Bundle examples within -devel
- Use global instead of define

* Sat Apr  4 2009 kwizart < kwizart at gmail.com > - 0.3.1-2
- Prevent conflict with GNU getline() in recent rawhide

* Tue Mar 17 2009 kwizart < kwizart at gmail.com > - 0.3.1-1
- Update to 0.3.1

* Tue Jan 13 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
- Update to 0.3.0
- Add KateDJ and katalyzer in -utils
- Add BR liboggz and -utils Requires liboggz

* Wed Nov 27 2008 kwizart < kwizart at gmail.com > - 0.2.7-1
- Update to 0.2.7

* Mon Oct 20 2008 kwizart < kwizart at gmail.com > - 0.2.5-1
- Update to 0.2.5

* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.2.1-1
- Update to 0.2.1

* Thu Sep 11 2008 kwizart < kwizart at gmail.com > - 0.1.12-1
- Update to 0.1.12

* Thu Sep  4 2008 kwizart < kwizart at gmail.com > - 0.1.11-1
- Update to 0.1.11

* Wed Sep  3 2008 kwizart < kwizart at gmail.com > - 0.1.10-1
- Update to 0.1.10

* Tue Sep  2 2008 kwizart < kwizart at gmail.com > - 0.1.9-1
- Update to 0.1.9

* Fri Aug 29 2008 kwizart < kwizart at gmail.com > - 0.1.8-1
- Update to 0.1.8

* Mon Aug 11 2008 kwizart < kwizart at gmail.com > - 0.1.7-1
- Initial spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2009 22:04:48 -0000	1.1
+++ .cvsignore	10 Apr 2009 23:24:27 -0000	1.2
@@ -0,0 +1 @@
+libkate-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2009 22:04:48 -0000	1.1
+++ sources	10 Apr 2009 23:24:28 -0000	1.2
@@ -0,0 +1 @@
+d94894c5b6f12c0a5fed34307a32bb9d  libkate-0.3.1.tar.gz




More information about the fedora-extras-commits mailing list