diff --git a/libgweather.spec b/libgweather.spec index 30047aa..0a520c8 100644 --- a/libgweather.spec +++ b/libgweather.spec @@ -1,13 +1,12 @@ Name: libgweather Version: 2.26.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for weather information Group: System Environment/Libraries License: GPLv2+ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/libgweather/2.26/%{name}-%{version}.tar.bz2 -Source1: copy.xsl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel >= 2.8.0 @@ -45,14 +44,6 @@ developing applications that use %{name}. %configure --disable-static --disable-gtk-doc make %{?_smp_mflags} -cd po -make %{name}.pot -for p in *.po; do - msgmerge -U $p %{name}.pot -done -make -cd .. - # strip unneeded translations from .mo files # ideally intltool (ha!) would do that for us # http://bugzilla.gnome.org/show_bug.cgi?id=474987 @@ -60,6 +51,7 @@ cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --pot +sed -ie 's|POT-Creation-Date.*|POT-Creation-Date: 2008-10-01 00:00-0400\\n"|g' %{name}.pot for p in *.po; do msgmerge $p %{name}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out @@ -68,10 +60,6 @@ done %install rm -rf $RPM_BUILD_ROOT -# waste less space -xsltproc %{SOURCE1} data/Locations.xml > loc.xml -sed -e "s/^\s*//" -e "/^$/d" loc.xml > data/Locations.xml - make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -122,6 +110,10 @@ fi %changelog +* Wed Jun 10 2009 Matthias Clasen 2.26.1-3 +- Fix multilib parallel-installability (#477672) +- Remove some old optimizations that are now no-ops + * Mon Apr 27 2009 Matthias Clasen 2.26.1-2 - Don't drop schemas translations from po files