rpms/libgweather
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.91.0

Browse Source
This commit is contained in:
Matthew Barnes 2011-01-30 14:28:43 -05:00
parent a8ff19ca1c
commit 7be9971fb6
4 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
libgweather-2.30.0.tar.bz2
/libgweather-2.30.3.tar.bz2
/libgweather-2.91.0.tar.bz2

60
gettext-not-xml.patch
View File

@ -1,6 +1,6 @@
diff -up libgweather-2.29.4/configure.in.gettext libgweather-2.29.4/configure.in
--- libgweather-2.29.4/configure.in.gettext 2009-12-21 00:03:55.000000000 -0500
+++ libgweather-2.29.4/configure.in 2009-12-22 10:47:19.988816042 -0500
diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
--- libgweather-2.91.0/configure.ac.gettext 2010-10-04 18:08:07.000000000 -0400
+++ libgweather-2.91.0/configure.ac 2011-01-30 13:51:19.615635059 -0500
@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
AM_MAINTAINER_MODE
GNOME_MAINTAINER_MODE_DEFINES
@ -26,16 +26,16 @@ diff -up libgweather-2.29.4/configure.in.gettext libgweather-2.29.4/configure.in
AC_ARG_ENABLE(locations-compression,
[AC_HELP_STRING([--enable-locations-compression],
[Compress Locations.xml files])],
@@ -253,7 +250,7 @@ AC_OUTPUT([
@@ -236,7 +233,7 @@ AC_OUTPUT([
Makefile
doc/Makefile
po/Makefile.in
-po-locations/Makefile
+po-locations/Makefile.in
libgweather/Makefile
libgweather/gweather.pc
libgweather/gweather-uninstalled.pc
@@ -262,12 +259,6 @@ python/Makefile
libgweather/gweather-3.0.pc
libgweather/gweather-3.0-uninstalled.pc
@@ -244,12 +241,6 @@ data/Makefile
icons/Makefile
])
@ -48,16 +48,16 @@ diff -up libgweather-2.29.4/configure.in.gettext libgweather-2.29.4/configure.in
dnl ***************************************************************************
dnl *** Display Summary ***
dnl ***************************************************************************
@@ -278,6 +269,4 @@ libgweather-$VERSION configure summary:
@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary:
Source code location: ${srcdir}
Compiler: ${CC}
Python bindings: ${enable_python}
Introspection support: ${found_introspection}
- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
- Locations.xml compression: ${enable_locations_compression}
" >&2
diff -up libgweather-2.29.4/data/Makefile.am.gettext libgweather-2.29.4/data/Makefile.am
--- libgweather-2.29.4/data/Makefile.am.gettext 2009-12-21 00:02:57.000000000 -0500
+++ libgweather-2.29.4/data/Makefile.am 2009-12-22 10:46:49.984801127 -0500
diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am
--- libgweather-2.91.0/data/Makefile.am.gettext 2010-10-04 18:07:31.000000000 -0400
+++ libgweather-2.91.0/data/Makefile.am 2011-01-30 13:53:12.581466339 -0500
@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
libgweatherlocationsdir = $(pkgdatadir)
libgweatherlocations_in_files = Locations.xml.in
@ -117,12 +117,12 @@ diff -up libgweather-2.29.4/data/Makefile.am.gettext libgweather-2.29.4/data/Mak
-endif # USE_ONE_BIG_XML
-
check:
xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
diff -up libgweather-2.29.4/libgweather/gweather-location.c.gettext libgweather-2.29.4/libgweather/gweather-location.c
--- libgweather-2.29.4/libgweather/gweather-location.c.gettext 2009-12-21 00:02:57.000000000 -0500
+++ libgweather-2.29.4/libgweather/gweather-location.c 2009-12-22 10:46:49.985800696 -0500
### Locations.xml.in rebuild
rebuild-locations: locationdb.sqlite update-locations.py
$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c
--- libgweather-2.91.0/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500
+++ libgweather-2.91.0/libgweather/gweather-location.c 2011-01-30 13:51:19.616635049 -0500
@@ -22,11 +22,14 @@
#include <config.h>
#endif
@ -161,9 +161,9 @@ diff -up libgweather-2.29.4/libgweather/gweather-location.c.gettext libgweather-
xmlFree (value);
normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
loc->sort_name = g_utf8_casefold (normalized, -1);
diff -up libgweather-2.29.4/libgweather/gweather-timezone.c.gettext libgweather-2.29.4/libgweather/gweather-timezone.c
--- libgweather-2.29.4/libgweather/gweather-timezone.c.gettext 2009-12-21 00:02:57.000000000 -0500
+++ libgweather-2.29.4/libgweather/gweather-timezone.c 2009-12-22 10:46:49.986801592 -0500
diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c
--- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500
+++ libgweather-2.91.0/libgweather/gweather-timezone.c 2011-01-30 13:51:19.617635039 -0500
@@ -23,6 +23,7 @@
#endif
@ -220,9 +220,9 @@ diff -up libgweather-2.29.4/libgweather/gweather-timezone.c.gettext libgweather-
if (name)
xmlFree (name);
diff -up libgweather-2.29.4/po-locations/LINGUAS.gettext libgweather-2.29.4/po-locations/LINGUAS
--- libgweather-2.29.4/po-locations/LINGUAS.gettext 2009-12-22 10:46:49.987801160 -0500
+++ libgweather-2.29.4/po-locations/LINGUAS 2009-12-22 10:46:49.987801160 -0500
diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS
--- libgweather-2.91.0/po-locations/LINGUAS.gettext 2011-01-30 13:51:19.617635039 -0500
+++ libgweather-2.91.0/po-locations/LINGUAS 2011-01-30 13:51:19.617635039 -0500
@@ -0,0 +1,78 @@
+ang
+ar
@ -302,9 +302,9 @@ diff -up libgweather-2.29.4/po-locations/LINGUAS.gettext libgweather-2.29.4/po-l
+zh_CN
+zh_HK
+zh_TW
diff -up libgweather-2.29.4/po-locations/Makefile.in.in.gettext libgweather-2.29.4/po-locations/Makefile.in.in
--- libgweather-2.29.4/po-locations/Makefile.in.in.gettext 2009-12-22 10:46:49.988801497 -0500
+++ libgweather-2.29.4/po-locations/Makefile.in.in 2009-12-22 10:46:49.988801497 -0500
diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in
--- libgweather-2.91.0/po-locations/Makefile.in.in.gettext 2011-01-30 13:51:19.618635028 -0500
+++ libgweather-2.91.0/po-locations/Makefile.in.in 2011-01-30 13:51:19.618635028 -0500
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@ -523,9 +523,9 @@ diff -up libgweather-2.29.4/po-locations/Makefile.in.in.gettext libgweather-2.29
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -up libgweather-2.29.4/po-locations/POTFILES.in.gettext libgweather-2.29.4/po-locations/POTFILES.in
--- libgweather-2.29.4/po-locations/POTFILES.in.gettext 2009-12-22 10:46:49.988801497 -0500
+++ libgweather-2.29.4/po-locations/POTFILES.in 2009-12-22 10:46:49.988801497 -0500
diff -up libgweather-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in
--- libgweather-2.91.0/po-locations/POTFILES.in.gettext 2011-01-30 13:51:19.618635028 -0500
+++ libgweather-2.91.0/po-locations/POTFILES.in 2011-01-30 13:51:19.618635028 -0500
@@ -0,0 +1,4 @@
+# This list should contain *only* data/Locations.xml.in.
+# Everything else should be in POTFILES.skip.

18
libgweather.spec
View File

@ -1,5 +1,5 @@
Name: libgweather
Version: 2.30.3
Version: 2.91.0
Release: 1%{?dist}
Summary: A library for weather information
@ -18,6 +18,7 @@ BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gtk-doc
BuildRequires: autoconf automake libtool
BuildRequires: gobject-introspection >= 0.10
# for directories
Requires: gnome-icon-theme
@ -94,7 +95,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || :
%defattr(-,root,root,-)
%doc COPYING
%{_sysconfdir}/gconf/schemas/gweather.schemas
%{_libdir}/libgweather.so.*
%{_libdir}/libgweather-3.so.*
%{_libdir}/girepository-1.0/GWeather-3.0.typelib
%dir %{_datadir}/libgweather
%{_datadir}/libgweather/Locations.xml
%{_datadir}/libgweather/locations.dtd
@ -102,13 +104,17 @@ gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || :
%files devel
%defattr(-,root,root,-)
%{_includedir}/libgweather
%{_libdir}/libgweather.so
%{_libdir}/pkgconfig/gweather.pc
%{_datadir}/gtk-doc/html/libgweather
%{_includedir}/libgweather-3.0
%{_libdir}/libgweather-3.so
%{_libdir}/pkgconfig/gweather-3.0.pc
%{_datadir}/gir-1.0/GWeather-3.0.gir
%{_datadir}/gtk-doc/html/libgweather-3.0
%changelog
* Sun Jan 30 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.0-1
- Update to 2.91.0
* Thu Sep 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.3-1
- Update to 2.30.3

2
sources
View File

@ -1 +1 @@
bf6a0a05051341ecb250f332e3edfb88 libgweather-2.30.3.tar.bz2
caca489d500e7a8e3cd5ad3b38b78273 libgweather-2.91.0.tar.bz2