From de23165d214cb71fceb6d1518d6540c96edab76fb59d2168e5fa2fd2c48026e9 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 12 Oct 2010 09:23:45 +0000
Subject: [PATCH] Accepting request 50255 from
 home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/50255
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=36
---
 baselibs.conf   |  2 +-
 libgtop.changes | 10 ++++++++
 libgtop.spec    | 66 +++++++++++--------------------------------------
 3 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index ce410c8..add1dc7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libgtop
 libgtop-2_0-7
+  provides "libgtop-<targettype> = <version>"
diff --git a/libgtop.changes b/libgtop.changes
index 25ed485..404c7b5 100644
--- a/libgtop.changes
+++ b/libgtop.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 11 20:24:37 CEST 2010 - vuntz@opensuse.org
+
+- Remove libgtop package that was empty, and add Provides/Obsoletes
+  for it to libgtop-2_0-7. Also move the Requires of the lang
+  package there, as a Recommends.
+- Remove unneeded Requires of devel package: glib2-devel,
+  gdbm-devel, xorg-x11-devel. Only glib2-devel was really needed,
+  and it will be added automatically via the pkgconfig() way.
+
 -------------------------------------------------------------------
 Tue Sep 28 13:28:42 CEST 2010 - vuntz@opensuse.org
 
diff --git a/libgtop.spec b/libgtop.spec
index 2625cee..a0b7ad4 100644
--- a/libgtop.spec
+++ b/libgtop.spec
@@ -18,12 +18,6 @@
 
 
 Name:           libgtop
-BuildRequires:  fdupes
-BuildRequires:  glib2-devel
-BuildRequires:  intltool
-BuildRequires:  licenses
-BuildRequires:  translation-update-upstream
-BuildRequires:  xorg-x11-devel
 License:        GPLv2+
 Group:          Development/Libraries/GNOME
 Version:        2.28.2
@@ -35,15 +29,12 @@ Summary:        LibGTop Library
 Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/2.19/%{name}-%{version}.tar.bz2
 Source1:        %{name}_spec-update.sh
 Source99:       baselibs.conf
-Requires:       libgtop-2_0-7 licenses
-# assist solver to upgrade old libgtop after info.rpm
-PreReq:         %install_info_prereq
-# bug437293
-%ifarch ppc64
-Obsoletes:      libgtop-64bit
-%endif
-#
-Requires:       %{name}-lang = %{version}
+BuildRequires:  fdupes
+BuildRequires:  glib2-devel
+BuildRequires:  intltool
+BuildRequires:  licenses
+BuildRequires:  translation-update-upstream
+BuildRequires:  xorg-x11-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -54,19 +45,15 @@ On Linux systems, this information is taken directly from the /proc
 file system. On other systems, a server is used to read information
 from /dev/kmem.
 
-
-
-Authors:
---------
-    Martin Baulig (martin@home-of-linux.org)
-    Drazen Kacar (dave@srce.hr)
-
 %package -n libgtop-2_0-7
 License:        GPLv2+
 Summary:        LibGTop Library
 Group:          Development/Libraries/GNOME
-# Require translation package (%{name}) not older than the library:
-Requires:       %{name} >= %{version}
+Requires:       licenses
+Recommends:     %{name}-lang
+# Needed to make lang package installable
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      libgtop-64bit
@@ -81,18 +68,11 @@ On Linux systems, this information is taken directly from the /proc
 file system. On other systems, a server is used to read information
 from /dev/kmem.
 
-
-
-Authors:
---------
-    Martin Baulig (martin@home-of-linux.org)
-    Drazen Kacar (dave@srce.hr)
-
 %package devel
 License:        GPLv2+
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version} glib2-devel gdbm-devel xorg-x11-devel
+Requires:       libgtop-2_0-7 = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      libgtop-devel-64bit
@@ -104,18 +84,11 @@ PreReq:         %install_info_prereq
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-
-
-Authors:
---------
-    Martin Baulig (martin@home-of-linux.org)
-    Drazen Kacar (dave@srce.hr)
-
 %package doc
 License:        GPLv2+
 Summary:        LibGTop Library
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version}
+Requires:       libgtop-2_0-7 = %{version}
 PreReq:         /sbin/install-info
 
 %description doc
@@ -126,13 +99,6 @@ On Linux systems, this information is taken directly from the /proc
 file system. On other systems, a server is used to read information
 from /dev/kmem.
 
-
-
-Authors:
---------
-    Martin Baulig (martin@home-of-linux.org)
-    Drazen Kacar (dave@srce.hr)
-
 %lang_package
 %prep
 %setup -q
@@ -178,15 +144,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun doc
 %install_info_delete --info-dir=%{_datadir}/info %{_datadir}/info/%{name}2.info.gz
 
-%files
-%defattr(-, root, root)
-# TODO is empty
-%doc AUTHORS COPYING NEWS README copyright.txt
-
 %files lang -f %{name}-2.0.lang
 
 %files -n libgtop-2_0-7
 %defattr(-, root, root)
+%doc AUTHORS COPYING NEWS README copyright.txt
 %{_libdir}/*.so.*
 
 %files devel