diff --git a/gettext-not-xml.patch b/gettext-not-xml.patch index 8fdcf99..89d8ebf 100644 --- a/gettext-not-xml.patch +++ b/gettext-not-xml.patch @@ -1,6 +1,6 @@ -diff -up libgweather-2.28.0/configure.in.gettext libgweather-2.28.0/configure.in ---- libgweather-2.28.0/configure.in.gettext 2009-09-21 12:30:18.000000000 -0400 -+++ libgweather-2.28.0/configure.in 2009-09-23 23:06:09.533646963 -0400 +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 @@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0 AM_MAINTAINER_MODE GNOME_MAINTAINER_MODE_DEFINES @@ -35,8 +35,8 @@ diff -up libgweather-2.28.0/configure.in.gettext libgweather-2.28.0/configure.in libgweather/Makefile libgweather/gweather.pc libgweather/gweather-uninstalled.pc -@@ -261,12 +258,6 @@ data/Makefile - python/Makefile +@@ -262,12 +259,6 @@ python/Makefile + icons/Makefile ]) -if test "x$enable_big_xml" = "xyes"; then @@ -48,16 +48,16 @@ diff -up libgweather-2.28.0/configure.in.gettext libgweather-2.28.0/configure.in dnl *************************************************************************** dnl *** Display Summary *** dnl *************************************************************************** -@@ -277,6 +268,4 @@ libgweather-$VERSION configure summary: +@@ -278,6 +269,4 @@ libgweather-$VERSION configure summary: Source code location: ${srcdir} Compiler: ${CC} Python bindings: ${enable_python} - Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} - Locations.xml compression: ${enable_locations_compression} " >&2 -diff -up libgweather-2.28.0/data/Makefile.am.gettext libgweather-2.28.0/data/Makefile.am ---- libgweather-2.28.0/data/Makefile.am.gettext 2009-07-21 13:01:11.000000000 -0400 -+++ libgweather-2.28.0/data/Makefile.am 2009-09-23 23:02:32.718640615 -0400 +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 @@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd libgweatherlocationsdir = $(pkgdatadir) libgweatherlocations_in_files = Locations.xml.in @@ -120,9 +120,9 @@ diff -up libgweather-2.28.0/data/Makefile.am.gettext libgweather-2.28.0/data/Mak check: xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in -diff -up libgweather-2.28.0/libgweather/gweather-location.c.gettext libgweather-2.28.0/libgweather/gweather-location.c ---- libgweather-2.28.0/libgweather/gweather-location.c.gettext 2009-04-19 13:41:11.000000000 -0400 -+++ libgweather-2.28.0/libgweather/gweather-location.c 2009-09-23 23:02:32.720641289 -0400 +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 @@ -22,11 +22,14 @@ #include #endif @@ -161,9 +161,9 @@ diff -up libgweather-2.28.0/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.28.0/libgweather/gweather-timezone.c.gettext libgweather-2.28.0/libgweather/gweather-timezone.c ---- libgweather-2.28.0/libgweather/gweather-timezone.c.gettext 2009-09-08 19:46:08.000000000 -0400 -+++ libgweather-2.28.0/libgweather/gweather-timezone.c 2009-09-23 23:02:32.721640718 -0400 +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 @@ -23,6 +23,7 @@ #endif @@ -220,9 +220,9 @@ diff -up libgweather-2.28.0/libgweather/gweather-timezone.c.gettext libgweather- if (name) xmlFree (name); -diff -up /dev/null libgweather-2.28.0/po-locations/LINGUAS ---- /dev/null 2009-09-23 15:09:11.116404522 -0400 -+++ libgweather-2.28.0/po-locations/LINGUAS 2009-09-23 23:02:32.723640903 -0400 +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 @@ -0,0 +1,78 @@ +ang +ar @@ -302,9 +302,9 @@ diff -up /dev/null libgweather-2.28.0/po-locations/LINGUAS +zh_CN +zh_HK +zh_TW -diff -up /dev/null libgweather-2.28.0/po-locations/Makefile.in.in ---- /dev/null 2009-09-23 15:09:11.116404522 -0400 -+++ libgweather-2.28.0/po-locations/Makefile.in.in 2009-09-23 23:02:32.724640890 -0400 +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 @@ -0,0 +1,217 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper @@ -523,9 +523,9 @@ diff -up /dev/null libgweather-2.28.0/po-locations/Makefile.in.in +# 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 /dev/null libgweather-2.28.0/po-locations/POTFILES.in ---- /dev/null 2009-09-23 15:09:11.116404522 -0400 -+++ libgweather-2.28.0/po-locations/POTFILES.in 2009-09-23 23:02:32.726641354 -0400 +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 @@ -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 d5145ab..2e44786 100644 --- a/libgweather.spec +++ b/libgweather.spec @@ -19,6 +19,9 @@ BuildRequires: intltool BuildRequires: gtk-doc BuildRequires: autoconf automake libtool +# for directories +Requires: gnome-icon-theme + # Patch from Ubuntu... Patch0: gettext-not-xml.patch @@ -68,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gweather.schemas > /dev/null || : +touch --no-create %{_datadir}/icons/gnome &>/dev/null || : %pre if [ "$1" -gt 1 ]; then @@ -81,8 +85,15 @@ if [ "$1" -eq 0 ]; then gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gweather.schemas > /dev/null || : fi -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +if [ $1 -eq 0 ]; then + touch --no-create %{_datadir}/icons/gnome &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : +fi +%posttrans +gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -92,6 +103,7 @@ fi %dir %{_datadir}/libgweather %{_datadir}/libgweather/Locations.xml %{_datadir}/libgweather/locations.dtd +%{_datadir}/icons/gnome/*/status/* %files devel %defattr(-,root,root,-)