From 2d5c2cf9d461d8d0b7651ca0586ec5a0f0e84a31 Mon Sep 17 00:00:00 2001
From: oddsocks <oddsocks@fedoraproject.org>
Date: Wed, 5 Mar 2008 23:11:11 +0000
Subject: [PATCH] *** empty log message ***

---
 .cvsignore |  2 +-
 sources    |  2 +-
 zvbi.spec  | 29 ++++++++++++++++-------------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f1390d1..bc0c205 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zvbi-0.2.26.tar.bz2
+zvbi-0.2.30.tar.bz2
diff --git a/sources b/sources
index 5799eee..e9f0e45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82805319ca61f6ffd7b7bb64d7433448  zvbi-0.2.26.tar.bz2
+ab131c42115188e131def8f5364e4491  zvbi-0.2.30.tar.bz2
diff --git a/zvbi.spec b/zvbi.spec
index 735ab67..cc495c2 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -2,15 +2,16 @@
 %define             catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:               zvbi
-Version:            0.2.26
-Release:            3%{?dist}
+Version:            0.2.30
+Release:            1%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
-License:            GPLv2+
+# See NEWS for a full breakdown of licensing.
+License:            LGPLv2+ and GPLv2+ and BSD
 URL:                http://zapping.sourceforge.net/ZVBI/index.html
 Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
-Patch0:             zvbi-0.2.24-tvfonts.patch
-Patch1:             zvbi-0.2.25-openfix.patch
+Patch0:             %{name}-0.2.24-tvfonts.patch
+Patch1:             %{name}-0.2.25-openfix.patch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
@@ -65,10 +66,7 @@ Fonts from zvbi converted for use with X11
 %patch -p1 -b .orig
 %patch1 -p1
 
-#Fix character encodings (note ChangeLog's encoding is broken, hence sed)
-sed -i 's/\xC3\xB2/\xF2/g' ChangeLog
-sed -i 's/\xC2\x81//g' ChangeLog
-iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
+#Fix character encodings
 iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
 
 
@@ -103,11 +101,11 @@ make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 #Install init script
-install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid
+install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid
 
 #Install fonts
-install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir}
-install -m 0644 contrib/fonts.* %{buildroot}%{fontdir}
+install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir}
+install -pm0644 contrib/fonts.* %{buildroot}%{fontdir}
 
 #%%ghost the fonts.cache-1 and fonts.dir
 touch %{buildroot}%{fontdir}/fonts.cache-1
@@ -166,7 +164,7 @@ fi
 %{_mandir}/man1/*
 %exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
-%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO
 
 
 %files devel
@@ -187,6 +185,11 @@ fi
 
 
 %changelog
+* Wed Mar 05 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.2.30-1
+- Update to 0.2.30
+- Updated license field due to license change GPLv2+ -> LGPLv2+
+- Dropped encoding fixes for ChangeLog. No longer needed.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.2.26-3
 - Autorebuild for GCC 4.3