rpms/tvtime/devel tvtime-1.0.2-localedef.patch, NONE, 1.1 tvtime.spec, 1.39, 1.40

[Tomas Smetana]

Author: tsmetana

Update of /cvs/pkgs/rpms/tvtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28548

Modified Files:
	tvtime.spec 
Added Files:
	tvtime-1.0.2-localedef.patch 
Log Message:
* Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-7
- fix conflictng type for locale_t
- fix build requires for rawhide


tvtime-1.0.2-localedef.patch:

--- NEW FILE tvtime-1.0.2-localedef.patch ---
diff -up tvtime-1.0.2/src/xmltv.c.localedef tvtime-1.0.2/src/xmltv.c
--- tvtime-1.0.2/src/xmltv.c.localedef	2009-05-31 15:33:13.000000000 +0200
+++ tvtime-1.0.2/src/xmltv.c	2009-05-31 15:33:57.000000000 +0200
@@ -118,9 +118,9 @@ const int num_timezones = sizeof( date_m
 typedef struct {
     const char *code;
     const char *name;
-} locale_t;
+} xmltv_locale_t;
 
-static locale_t locale_table[] = {
+static xmltv_locale_t locale_table[] = {
     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
@@ -168,7 +168,7 @@ static locale_t locale_table[] = {
     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
     {"ZU", "Zulu"} };
 
-const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
+const int num_locales = sizeof( locale_table ) / sizeof( xmltv_locale_t );
 
 /**
  * Timezone parsing code based loosely on the algorithm in


Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- tvtime.spec	31 May 2009 13:22:38 -0000	1.39
+++ tvtime.spec	31 May 2009 15:53:38 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -12,13 +12,14 @@ Patch1: tvtime-1.0.1-header.patch
 Patch2: tvtime-1.0.1-fsbadval.patch
 Patch3: tvtime-1.0.2-fonts.patch
 Patch4: tvtime-1.0.2-alsamixer.patch
+Patch5: tvtime-1.0.2-localedef.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.6
 Requires: font(liberationsans)
 Requires: font(liberationmono)
-Requires(post): desktop-file-utils
+Requires: desktop-file-utils
 Requires(post): hicolor-icon-theme
 Requires(postun): desktop-file-utils
 Requires(postun): hicolor-icon-theme
@@ -38,6 +39,7 @@ BuildRequires: libXv-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: libtool
+BuildRequires: /usr/bin/desktop-file-install
 
 ExcludeArch: s390 s390x
 
@@ -55,6 +57,7 @@ videophiles.
 %patch2 -p1 -b .fsbadval
 %patch3 -p1 -b .fonts
 %patch4 -p1 -b .alsamixer
+%patch5 -p1 -b .localedef
 
 for i in AUTHORS docs/man/{de,es}/*.?; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -67,6 +70,7 @@ sed -i "s|tvtime.png|tvtime|g" docs/net-
 
 
 %build
+libtoolize --force
 autoreconf
 %configure --disable-dependency-tracking --disable-rpath
 
@@ -120,6 +124,10 @@ fi
 %{_bindir}/tvtime
 
 %changelog
+* Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-7
+- fix conflictng type for locale_t
+- fix build requires for rawhide
+
 * Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-6
 - fix #498167 - patch by Philipp Hahn adding ALSA mixer support
 - merge review changes