rpms/libgweather/devel .cvsignore, 1.23, 1.24 01_gettext_not_xml.patch, 1.1, 1.2 libgweather.spec, 1.44, 1.45 sources, 1.23, 1.24
Matthias Clasen
mclasen at fedoraproject.org
Tue Aug 25 19:36:12 UTC 2009
- Previous message: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.903-remove_resources_RAC.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.48, 1.49
- Next message: rpms/ejabberd/devel ejabberd-ejabberdctl_fix.diff, 1.5, 1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.40, 1.41 import.log, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13296
Modified Files:
.cvsignore 01_gettext_not_xml.patch libgweather.spec sources
Log Message:
fix patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore 14 Apr 2009 00:39:08 -0000 1.23
+++ .cvsignore 25 Aug 2009 19:36:12 -0000 1.24
@@ -1 +1 @@
-libgweather-2.26.1.tar.bz2
+libgweather-2.27.91.tar.bz2
01_gettext_not_xml.patch:
configure.in | 21 ---
data/Makefile.am | 44 +-------
libgweather/gweather-location.c | 17 ++-
libgweather/gweather-timezone.c | 18 ++-
po-locations/LINGUAS | 78 ++++++++++++++
po-locations/Makefile.in.in | 217 ++++++++++++++++++++++++++++++++++++++++
po-locations/POTFILES.in | 4
7 files changed, 338 insertions(+), 61 deletions(-)
Index: 01_gettext_not_xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/01_gettext_not_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 01_gettext_not_xml.patch 20 Jul 2009 14:45:32 -0000 1.1
+++ 01_gettext_not_xml.patch 25 Aug 2009 19:36:12 -0000 1.2
@@ -1,9 +1,7 @@
-only in patch2:
-unchanged:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/configure.in libgweather-2.26.1.new/configure.in
---- libgweather-2.26.1/configure.in 2009-04-14 00:07:38.000000000 +0200
-+++ libgweather-2.26.1.new/configure.in 2009-04-23 18:18:50.000000000 +0200
-@@ -38,6 +38,10 @@
+diff -up libgweather-2.27.91/configure.in.gettext libgweather-2.27.91/configure.in
+--- libgweather-2.27.91/configure.in.gettext 2009-08-25 09:56:58.000000000 -0400
++++ libgweather-2.27.91/configure.in 2009-08-25 15:25:17.411026687 -0400
+@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
AM_MAINTAINER_MODE
GNOME_MAINTAINER_MODE_DEFINES
@@ -14,7 +12,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
IT_PROG_INTLTOOL([0.40.3])
PKG_PROG_PKG_CONFIG([0.19])
-@@ -48,13 +52,6 @@
+@@ -50,13 +54,6 @@ AC_STDC_HEADERS
AM_PROG_LIBTOOL
AC_PATH_PROG(GCONFTOOL, gconftool-2)
@@ -28,7 +26,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
AC_ARG_ENABLE(locations-compression,
[AC_HELP_STRING([--enable-locations-compression],
[Compress Locations.xml files])],
-@@ -242,7 +239,7 @@
+@@ -253,7 +250,7 @@ AC_OUTPUT([
Makefile
doc/Makefile
po/Makefile.in
@@ -37,7 +35,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
libgweather/Makefile
libgweather/gweather.pc
libgweather/gweather-uninstalled.pc
-@@ -250,12 +247,6 @@
+@@ -261,12 +258,6 @@ data/Makefile
python/Makefile
])
@@ -50,17 +48,17 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
dnl ***************************************************************************
dnl *** Display Summary ***
dnl ***************************************************************************
-@@ -265,6 +256,4 @@
+@@ -276,6 +267,4 @@ libgweather-$VERSION configure summary:
Prefix: ${prefix}
Source code location: ${srcdir}
Compiler: ${CC}
- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
- Locations.xml compression: ${enable_locations_compression}
" >&2
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/data/Makefile.am libgweather-2.26.1.new/data/Makefile.am
---- libgweather-2.26.1/data/Makefile.am 2009-04-14 00:00:59.000000000 +0200
-+++ libgweather-2.26.1.new/data/Makefile.am 2009-04-23 18:18:50.000000000 +0200
-@@ -4,55 +4,23 @@
+diff -up libgweather-2.27.91/data/Makefile.am.gettext libgweather-2.27.91/data/Makefile.am
+--- libgweather-2.27.91/data/Makefile.am.gettext 2009-07-21 13:01:11.000000000 -0400
++++ libgweather-2.27.91/data/Makefile.am 2009-08-25 15:29:50.529265774 -0400
+@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
libgweatherlocationsdir = $(pkgdatadir)
libgweatherlocations_in_files = Locations.xml.in
@@ -71,7 +69,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
-
-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-- LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`
+- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \
- fi
@@ -94,7 +92,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
$(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-- LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data)
+- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
- for pofile in $(PO_LOCATIONS); do \
- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \
- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
@@ -103,17 +101,18 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
- gzip --force Locations.$$locale.xml; \
- fi; \
-- done
-- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data)
-- rm -f C/$(libgweatherlocations_data)
+- done && \
+- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
+- rm -f C/$(libgweatherlocations_data) && \
+- test -d C && rmdir C && \
+- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
+- gzip --force Locations.xml; \
+- fi && \
+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
+ rm -f C/$(libgweatherlocations_DATA)
- test -d C && rmdir C
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.xml; \
-- fi
++ test -d C && rmdir C
touch $@
-endif # USE_ONE_BIG_XML
@@ -121,9 +120,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
check:
xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-location.c libgweather-2.26.1.new/libgweather/gweather-location.c
---- libgweather-2.26.1/libgweather/gweather-location.c 2009-04-14 00:00:47.000000000 +0200
-+++ libgweather-2.26.1.new/libgweather/gweather-location.c 2009-04-23 18:19:23.000000000 +0200
+diff -up libgweather-2.27.91/libgweather/gweather-location.c.gettext libgweather-2.27.91/libgweather/gweather-location.c
+--- libgweather-2.27.91/libgweather/gweather-location.c.gettext 2009-04-19 13:41:11.000000000 -0400
++++ libgweather-2.27.91/libgweather/gweather-location.c 2009-08-25 15:25:17.416018454 -0400
@@ -22,11 +22,14 @@
#include <config.h>
#endif
@@ -139,7 +138,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
#include "gweather-location.h"
-@@ -184,10 +187,20 @@
+@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
tagname = (const char *) xmlTextReaderConstName (parser->xml);
if (!strcmp (tagname, "name") && !loc->name) {
@@ -162,9 +161,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
xmlFree (value);
normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-timezone.c libgweather-2.26.1.new/libgweather/gweather-timezone.c
---- libgweather-2.26.1/libgweather/gweather-timezone.c 2009-04-14 00:00:47.000000000 +0200
-+++ libgweather-2.26.1.new/libgweather/gweather-timezone.c 2009-04-23 18:19:37.000000000 +0200
+diff -up libgweather-2.27.91/libgweather/gweather-timezone.c.gettext libgweather-2.27.91/libgweather/gweather-timezone.c
+--- libgweather-2.27.91/libgweather/gweather-timezone.c.gettext 2009-08-12 05:00:52.000000000 -0400
++++ libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-25 15:25:17.417013203 -0400
@@ -23,6 +23,7 @@
#endif
@@ -173,7 +172,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
#include "gweather-timezone.h"
-@@ -155,7 +156,7 @@
+@@ -152,7 +153,7 @@ static GWeatherTimezone *
parse_timezone (GWeatherParser *parser)
{
GWeatherTimezone *zone = NULL;
@@ -182,7 +181,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
int offset, dst_offset;
gboolean has_dst = FALSE;
-@@ -178,27 +179,34 @@
+@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
continue;
}
@@ -221,9 +220,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
if (name)
xmlFree (name);
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/LINGUAS libgweather-2.26.1.new/po-locations/LINGUAS
---- libgweather-2.26.1/po-locations/LINGUAS 1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/LINGUAS 2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/LINGUAS
+--- /dev/null 2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/LINGUAS 2009-08-25 15:25:17.419017718 -0400
@@ -0,0 +1,78 @@
+ang
+ar
@@ -303,9 +302,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
+zh_CN
+zh_HK
+zh_TW
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/Makefile.in.in libgweather-2.26.1.new/po-locations/Makefile.in.in
---- libgweather-2.26.1/po-locations/Makefile.in.in 1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/Makefile.in.in 2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/Makefile.in.in
+--- /dev/null 2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/Makefile.in.in 2009-08-25 15:25:17.420027972 -0400
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -524,9 +523,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
+# 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 -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/POTFILES.in libgweather-2.26.1.new/po-locations/POTFILES.in
---- libgweather-2.26.1/po-locations/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/POTFILES.in 2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/POTFILES.in
+--- /dev/null 2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/POTFILES.in 2009-08-25 15:25:17.421017903 -0400
@@ -0,0 +1,4 @@
+# This list should contain *only* data/Locations.xml.in.
+# Everything else should be in POTFILES.skip.
Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- libgweather.spec 25 Jul 2009 05:51:50 -0000 1.44
+++ libgweather.spec 25 Aug 2009 19:36:12 -0000 1.45
@@ -1,6 +1,6 @@
Name: libgweather
-Version: 2.26.1
-Release: 6%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
Summary: A library for weather information
Group: System Environment/Libraries
@@ -102,6 +102,9 @@ fi
%changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 14 Apr 2009 00:39:08 -0000 1.23
+++ sources 25 Aug 2009 19:36:12 -0000 1.24
@@ -1 +1 @@
-382041ee8f4efeec1afde968624d34fe libgweather-2.26.1.tar.bz2
+0f9cc594f17b94b60f12bfe444743964 libgweather-2.27.91.tar.bz2
- Previous message: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.903-remove_resources_RAC.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.48, 1.49
- Next message: rpms/ejabberd/devel ejabberd-ejabberdctl_fix.diff, 1.5, 1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.40, 1.41 import.log, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list