From 705a5f170f1a650f800e34e23f51ca4d5745bf22a5c164b8f44865e6928096c2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:50:32 +0000 Subject: [PATCH 1/6] Accepting request 25379 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/libgtop via accept of submit request 25379 revision 13. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25379 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=27 --- libgtop.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libgtop.spec b/libgtop.spec index b20249f..4bdc903 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -24,10 +24,10 @@ BuildRequires: intltool BuildRequires: licenses BuildRequires: translation-update-upstream BuildRequires: xorg-x11-devel -License: GPLv2+ +License: GPL v2 or later Group: Development/Libraries/GNOME Version: 2.28.0 -Release: 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) %define libgtop-2_0_name 7 @@ -61,7 +61,7 @@ Authors: Drazen Kacar (dave@srce.hr) %package -n libgtop-2_0-7 -License: GPLv2+ +License: GPL v2 or later Summary: LibGTop Library Group: Development/Libraries/GNOME # Require translation package (%{name}) not older than the library: @@ -88,7 +88,7 @@ Authors: Drazen Kacar (dave@srce.hr) %package devel -License: GPLv2+ +License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gdbm-devel xorg-x11-devel @@ -111,7 +111,7 @@ Authors: Drazen Kacar (dave@srce.hr) %package doc -License: GPLv2+ +License: GPL v2 or later Summary: LibGTop Library Group: Development/Libraries/GNOME Requires: %{name} = %{version} From c5e1776fc47bf691d8d9996de7f9c0a692f101a6ad8685514b00db58da1ecf84 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 10:53:46 +0000 Subject: [PATCH 2/6] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=28 --- libgtop.changes | 6 ------ libgtop.spec | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libgtop.changes b/libgtop.changes index 23c49f8..e828091 100644 --- a/libgtop.changes +++ b/libgtop.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 4bdc903..59801c8 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -145,9 +145,6 @@ 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 @@ -180,6 +177,10 @@ 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) From 1049973190796c7c0a97e8ed1a52b72cbf2bf3d609bca7b8f062c261254a5e8e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 10 Feb 2010 13:21:31 +0000 Subject: [PATCH 3/6] 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) From d24a99678ee4d139d41dc7dc094524d91807f48e2d5e32f0790c53b7b4e54905 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 10 Feb 2010 13:22:23 +0000 Subject: [PATCH 4/6] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=30 --- libgtop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgtop.spec b/libgtop.spec index 3ec1622..3854249 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -34,7 +34,7 @@ Release: 2 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 +Source99: baselibs.conf Requires: libgtop-2_0-7 licenses # assist solver to upgrade old libgtop after info.rpm PreReq: %install_info_prereq From e0621ae544ac7c98d47b5187037543665797f3f13feb19607936a7dfbe4bedee Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 11 Feb 2010 19:03:41 +0000 Subject: [PATCH 5/6] checked in (request 32282) OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=31 --- libgtop.changes | 5 ----- libgtop.spec | 1 - 2 files changed, 6 deletions(-) diff --git a/libgtop.changes b/libgtop.changes index f5925ac..23c49f8 100644 --- a/libgtop.changes +++ b/libgtop.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/libgtop.spec b/libgtop.spec index 3854249..b20249f 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -34,7 +34,6 @@ Release: 2 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 From 8e06a5d92859e901f2c734a81f46407d6154a94cd86f8ee65d85096933b6ef5d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 19:03:42 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/libgtop revision 29.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=37faba3ea30f2f9f386d5a6aaab944c1 --- libgtop.changes | 5 +++++ libgtop.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgtop.changes b/libgtop.changes index 23c49f8..f5925ac 100644 --- a/libgtop.changes +++ b/libgtop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libgtop.spec b/libgtop.spec index b20249f..b6b1178 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -1,7 +1,7 @@ # # spec file for package libgtop (Version 2.28.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,13 +27,14 @@ BuildRequires: xorg-x11-devel License: GPLv2+ Group: Development/Libraries/GNOME Version: 2.28.0 -Release: 2 +Release: 3 # 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 +Source99: baselibs.conf Requires: libgtop-2_0-7 licenses # assist solver to upgrade old libgtop after info.rpm PreReq: %install_info_prereq