From 1049973190796c7c0a97e8ed1a52b72cbf2bf3d609bca7b8f062c261254a5e8e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 10 Feb 2010 13:21:31 +0000
Subject: [PATCH] Accepting request 31029 from home:jengelh:baselibs

Copy from home:jengelh:baselibs/libgtop via accept of submit request 31029 revision 2.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/31029
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=29
---
 libgtop.changes | 11 +++++++++++
 libgtop.spec    | 18 +++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/libgtop.changes b/libgtop.changes
index e828091..f5925ac 100644
--- a/libgtop.changes
+++ b/libgtop.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb  1 11:34:35 UTC 2010 - jengelh@medozas.de
+
+- Package baselibs.conf
+
+-------------------------------------------------------------------
+Wed Dec  2 12:00:26 CET 2009 - vuntz@opensuse.org
+
+- Update the way we remove the la locale for old versions of
+  openSUSE.
+
 -------------------------------------------------------------------
 Tue Sep 22 19:43:04 CEST 2009 - dimstar@opensuse.org
 
diff --git a/libgtop.spec b/libgtop.spec
index 59801c8..3ec1622 100644
--- a/libgtop.spec
+++ b/libgtop.spec
@@ -24,16 +24,17 @@ BuildRequires:  intltool
 BuildRequires:  licenses
 BuildRequires:  translation-update-upstream
 BuildRequires:  xorg-x11-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Development/Libraries/GNOME
 Version:        2.28.0
-Release:        1
+Release:        2
 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
 #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libgtop-2_0)
 %define libgtop-2_0_name 7
 Summary:        LibGTop Library
 Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/2.19/%{name}-%{version}.tar.bz2
 Source1:        %{name}_spec-update.sh
+Source2:	baselibs.conf
 Requires:       libgtop-2_0-7 licenses
 # assist solver to upgrade old libgtop after info.rpm
 PreReq:         %install_info_prereq
@@ -61,7 +62,7 @@ Authors:
     Drazen Kacar (dave@srce.hr)
 
 %package -n libgtop-2_0-7
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        LibGTop Library
 Group:          Development/Libraries/GNOME
 # Require translation package (%{name}) not older than the library:
@@ -88,7 +89,7 @@ Authors:
     Drazen Kacar (dave@srce.hr)
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version} glib2-devel gdbm-devel xorg-x11-devel
@@ -111,7 +112,7 @@ Authors:
     Drazen Kacar (dave@srce.hr)
 
 %package doc
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        LibGTop Library
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
@@ -145,6 +146,9 @@ translation-update-upstream
 
 %install
 %makeinstall
+%if 0%{?suse_version} <= 1110
+%{__rm} %{buildroot}%{_datadir}/locale/la/LC_MESSAGES/*
+%endif
 %find_lang %{name}-2.0
 LIBNAME="$(echo $RPM_BUILD_ROOT%{_libdir}/%{name}-*.so.? | sed 's/.*\///;s/\.so\./-/;s/\./_/')"
 if test "$LIBNAME" != libgtop-2_0-7 ; then
@@ -177,10 +181,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING NEWS README copyright.txt
 
 %files lang -f %{name}-2.0.lang
-%if %suse_version <= 1110
-# exclude locales which don't exist on old versions of openSUSE
-%exclude %{_datadir}/locale/la/LC_MESSAGES/*
-%endif
 
 %files -n libgtop-2_0-7
 %defattr(-, root, root)