From 40883a9604912ed2de6840334ff1148403bc7accebf6f45679cb23878ed1dd8e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 31 Mar 2011 04:40:17 +0000 Subject: [PATCH] Accepting request 64785 from home:coolo:nolicenses self accept to fix factory OBS-URL: https://build.opensuse.org/request/show/64785 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=38 --- baselibs.conf | 2 +- libgtop-2.28.1.tar.bz2 | 3 -- libgtop-2.28.2.tar.bz2 | 3 ++ libgtop.changes | 21 ++++++++++++ libgtop.spec | 74 ++++++++---------------------------------- 5 files changed, 39 insertions(+), 64 deletions(-) delete mode 100644 libgtop-2.28.1.tar.bz2 create mode 100644 libgtop-2.28.2.tar.bz2 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- = " diff --git a/libgtop-2.28.1.tar.bz2 b/libgtop-2.28.1.tar.bz2 deleted file mode 100644 index 7e3eea4..0000000 --- a/libgtop-2.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6 -size 760104 diff --git a/libgtop-2.28.2.tar.bz2 b/libgtop-2.28.2.tar.bz2 new file mode 100644 index 0000000..7bf0562 --- /dev/null +++ b/libgtop-2.28.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d +size 766124 diff --git a/libgtop.changes b/libgtop.changes index cf1e91d..4c774de 100644 --- a/libgtop.changes +++ b/libgtop.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Mar 21 16:56:16 UTC 2011 - coolo@novell.com + +- licenses package is about to die + +------------------------------------------------------------------- +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 + +- Update to version 2.28.2: + + Updated translations. + ------------------------------------------------------------------- Tue Mar 30 19:45:42 CEST 2010 - vuntz@opensuse.org diff --git a/libgtop.spec b/libgtop.spec index 7db384b..73394d4 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -1,5 +1,5 @@ # -# spec file for package libgtop (Version 2.28.1) +# spec file for package libgtop (Version 2.28.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,9 @@ 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.1 +Version: 2.28.2 Release: 1 # 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) @@ -35,15 +29,11 @@ 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: translation-update-upstream +BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,19 +44,14 @@ 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} +Recommends: %{name}-lang +# Needed to make lang package installable +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} # bug437293 %ifarch ppc64 Obsoletes: libgtop-64bit @@ -81,18 +66,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 +82,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 +97,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 @@ -158,12 +122,6 @@ if test "$LIBNAME" != libgtop-2_0-7 ; then echo "Library version does not match package name. It should be $LIBNAME." exit 1 fi -for FILE in COPYING copyright.txt ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done %clean rm -rf $RPM_BUILD_ROOT @@ -178,15 +136,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