[libgweather/f17] fix patch

Matthias Clasen mclasen at fedoraproject.org
Sat Mar 10 01:58:41 UTC 2012 

commit 398b6f24fc36e9ef734416bf507c1fa0113c79e7
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Mar 9 20:58:55 2012 -0500

    fix patch

 .gitignore            |    1 +
 gettext-not-xml.patch |   65 +++++++++++++++++++++++++------------------------
 libgweather.spec      |    9 ++++--
 sources               |    2 +-
 4 files changed, 41 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6bf0fb..987c19a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libgweather-2.30.0.tar.bz2
 /libgweather-3.1.3.tar.xz
 /libgweather-3.2.0.tar.xz
 /libgweather-3.2.1.tar.xz
+/libgweather-3.4.1.tar.xz
diff --git a/gettext-not-xml.patch b/gettext-not-xml.patch
index db9c641..ba6e642 100644
--- a/gettext-not-xml.patch
+++ b/gettext-not-xml.patch
@@ -1,10 +1,11 @@
-diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
---- libgweather-3.1.3/configure.ac.gettext	2011-07-04 10:52:13.000000000 -0400
-+++ libgweather-3.1.3/configure.ac	2011-07-06 20:26:17.180168365 -0400
-@@ -43,19 +43,16 @@ GNOME_MAINTAINER_MODE_DEFINES
- LT_PREREQ([2.2.6])
+diff -up libgweather-3.4.1/configure.ac.gettext libgweather-3.4.1/configure.ac
+--- libgweather-3.4.1/configure.ac.gettext	2012-03-09 08:13:02.000000000 -0500
++++ libgweather-3.4.1/configure.ac	2012-03-09 20:55:11.441166924 -0500
+@@ -47,19 +47,17 @@ LT_PREREQ([2.2.6])
  LT_INIT([dlopen win32-dll disable-static])
+ LT_LIB_M
  
++ 
 +dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
 +AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
 +IT_PO_SUBDIR([po-locations])
@@ -16,16 +17,16 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  AC_PATH_PROG(GCONFTOOL, gconftool-2)
  
 -AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
+-        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
 -                        [Put all translations in a big Locations.xml file (slow to parse)])],
 -        [enable_big_xml=yes],
 -        [enable_big_xml=no])
 -AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
 -
  AC_ARG_ENABLE(locations-compression,
-         [AC_HELP_STRING([--enable-locations-compression],
+         [AS_HELP_STRING([--enable-locations-compression],
                          [Compress Locations.xml files])],
-@@ -191,7 +188,7 @@ AC_OUTPUT([
+@@ -182,7 +180,7 @@ AC_CONFIG_FILES([
  Makefile
  doc/Makefile
  po/Makefile.in
@@ -34,9 +35,9 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  libgweather/Makefile
  libgweather/gweather-3.0.pc
  libgweather/gweather-3.0-uninstalled.pc
-@@ -199,12 +196,6 @@ data/Makefile
- icons/Makefile
+@@ -191,12 +189,6 @@ icons/Makefile
  ])
+ AC_OUTPUT
  
 -if test "x$enable_big_xml" = "xyes"; then
 -	LOCATIONS_XML_TRANSLATIONS="one big file"
@@ -47,16 +48,16 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary:
+@@ -207,6 +199,4 @@ libgweather-$VERSION configure summary:
  	Source code location:		${srcdir}
  	Compiler:			${CC}
  	Introspection support:          ${found_introspection}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makefile.am
---- libgweather-3.1.3/data/Makefile.am.gettext	2011-04-04 16:52:54.000000000 -0400
-+++ libgweather-3.1.3/data/Makefile.am	2011-07-06 20:18:42.244855841 -0400
+diff -up libgweather-3.4.1/data/Makefile.am.gettext libgweather-3.4.1/data/Makefile.am
+--- libgweather-3.4.1/data/Makefile.am.gettext	2012-03-09 08:13:02.000000000 -0500
++++ libgweather-3.4.1/data/Makefile.am	2012-03-09 20:52:26.735164454 -0500
 @@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
@@ -119,9 +120,9 @@ diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makef
  ### 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-3.1.3/libgweather/gweather-location.c.gettext libgweather-3.1.3/libgweather/gweather-location.c
---- libgweather-3.1.3/libgweather/gweather-location.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-location.c	2011-07-06 20:18:42.251855754 -0400
+diff -up libgweather-3.4.1/libgweather/gweather-location.c.gettext libgweather-3.4.1/libgweather/gweather-location.c
+--- libgweather-3.4.1/libgweather/gweather-location.c.gettext	2012-03-09 08:13:02.000000000 -0500
++++ libgweather-3.4.1/libgweather/gweather-location.c	2012-03-09 20:52:26.742164453 -0500
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -137,7 +138,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-location.h"
-@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
+@@ -185,10 +188,20 @@ location_new_from_xml (GWeatherParser *p
  
  	tagname = (const char *) xmlTextReaderConstName (parser->xml);
  	if (!strcmp (tagname, "name") && !loc->name) {
@@ -160,9 +161,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3.1.3/libgweather/gweather-timezone.c
---- libgweather-3.1.3/libgweather/gweather-timezone.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-timezone.c	2011-07-06 20:18:42.252855742 -0400
+diff -up libgweather-3.4.1/libgweather/gweather-timezone.c.gettext libgweather-3.4.1/libgweather/gweather-timezone.c
+--- libgweather-3.4.1/libgweather/gweather-timezone.c.gettext	2012-03-09 08:13:02.000000000 -0500
++++ libgweather-3.4.1/libgweather/gweather-timezone.c	2012-03-09 20:52:26.743164454 -0500
 @@ -23,6 +23,7 @@
  #endif
  
@@ -171,7 +172,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@ static GWeatherTimezone *
+@@ -154,7 +155,7 @@ static GWeatherTimezone *
  parse_timezone (GWeatherParser *parser)
  {
      GWeatherTimezone *zone = NULL;
@@ -180,7 +181,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
      int offset = 0, dst_offset = 0;
      gboolean has_dst = FALSE;
  
-@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
+@@ -177,27 +178,34 @@ parse_timezone (GWeatherParser *parser)
  		continue;
  	    }
  
@@ -219,9 +220,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3
      if (name)
  	xmlFree (name);
  
-diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-locations/LINGUAS
---- libgweather-3.1.3/po-locations/LINGUAS.gettext	2011-07-06 20:18:42.253855730 -0400
-+++ libgweather-3.1.3/po-locations/LINGUAS	2011-07-06 20:18:42.253855730 -0400
+diff -up libgweather-3.4.1/po-locations/LINGUAS.gettext libgweather-3.4.1/po-locations/LINGUAS
+--- libgweather-3.4.1/po-locations/LINGUAS.gettext	2012-03-09 20:52:26.743164454 -0500
++++ libgweather-3.4.1/po-locations/LINGUAS	2012-03-09 20:52:26.743164454 -0500
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -301,9 +302,9 @@ diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-loc
 +zh_CN
 +zh_HK
 +zh_TW
-diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3/po-locations/Makefile.in.in
---- libgweather-3.1.3/po-locations/Makefile.in.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/Makefile.in.in	2011-07-06 20:18:42.254855718 -0400
+diff -up libgweather-3.4.1/po-locations/Makefile.in.in.gettext libgweather-3.4.1/po-locations/Makefile.in.in
+--- libgweather-3.4.1/po-locations/Makefile.in.in.gettext	2012-03-09 20:52:26.744164454 -0500
++++ libgweather-3.4.1/po-locations/Makefile.in.in	2012-03-09 20:52:26.744164454 -0500
 @@ -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>
@@ -522,9 +523,9 @@ diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3
 +# 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-3.1.3/po-locations/POTFILES.in.gettext libgweather-3.1.3/po-locations/POTFILES.in
---- libgweather-3.1.3/po-locations/POTFILES.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/POTFILES.in	2011-07-06 20:18:42.254855718 -0400
+diff -up libgweather-3.4.1/po-locations/POTFILES.in.gettext libgweather-3.4.1/po-locations/POTFILES.in
+--- libgweather-3.4.1/po-locations/POTFILES.in.gettext	2012-03-09 20:52:26.744164454 -0500
++++ libgweather-3.4.1/po-locations/POTFILES.in	2012-03-09 20:52:26.744164454 -0500
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.
diff --git a/libgweather.spec b/libgweather.spec
index c01178c..ef69282 100644
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -1,13 +1,13 @@
 Name:           libgweather
-Version:        3.2.1
-Release:        2%{?dist}
+Version:        3.4.1
+Release:        1%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org
 #VCS: git:git://git.gnome.org/libgweather
-Source0:        http://download.gnome.org/sources/libgweather/3.2/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/libgweather/3.4/%{name}-%{version}.tar.xz
 
 BuildRequires:  GConf2-devel >= 2.8.0
 BuildRequires:  dbus-devel
@@ -115,6 +115,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || :
 
 
 %changelog
+* Fri Mar  9 2012 Matthias Clasen <mclasen at redhat.com> - 3.4.1-1
+- Update to 3.4.1
+
 * Thu Jan 12 2012 Matthias Clasen <mclasen at redhat.com> - 3.2.1-2
 - Drop gtk-doc dependency
 
diff --git a/sources b/sources
index 18eb22f..e6d0025 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de91f7ed59508d2b96c319e19e27fda5  libgweather-3.2.1.tar.xz
+58ddea04842bd7ff122c7eae29a65815  libgweather-3.4.1.tar.xz

More information about the scm-commits mailing list