Accepting request 58230 from GNOME:Factory

Accepted submit request 58230 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/58230
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=75
This commit is contained in:
Marcus Rückert 2011-01-14 16:09:42 +00:00 committed by Git OBS Bridge
commit c140334878
5 changed files with 40 additions and 53 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb
size 1349752

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3742e2f5ff79188a656d9908ea0e4a0f583fa8f1fc159a2e04a8b9cf4c9445a
size 1226137

View File

@ -1,12 +0,0 @@
Index: gnome-about/gnome-about.desktop.in.in
===================================================================
--- gnome-about/gnome-about.desktop.in.in.orig
+++ gnome-about/gnome-about.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=About GNOME
-_Comment=Learn more about GNOME
+_GenericName=Learn more about GNOME
Exec=gnome-about
Icon=gnome-logo-icon-transparent
Terminal=false

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Jan 7 17:48:32 CET 2011 - vuntz@opensuse.org
- Update to version 2.91.4:
+ Remove gnome-about: a System Information panel in
gnome-control-center replaces it.
+ libgnome-desktop:
- Adapt to GTK+ 3 changes.
+ Misc
- Don't export private symbols in the shared library.
+ Updated translations.
- Drop gnome-desktop-gdk_functions.patch: fixed upstream.
- Drop gnome-desktop-desktop.patch: gnome-about got removed.
- Remove gnome-about packaging (that was disabled via
IS_DEFAULT_GNOME_DESKTOP): gnome-about got removed.
- Do not pass --disable-date-in-gnome-version and
--with-gnome-distributor="SUSE" to configure: the options don't
exist anymore.
-------------------------------------------------------------------
Tue Dec 14 19:42:40 CET 2010 - vuntz@opensuse.org
- Stop removing kg locale on 11.4 and later: bnc#659001 has been
fixed.
-------------------------------------------------------------------
Tue Dec 14 08:31:03 UTC 2010 - dimstar@opensuse.org
- Add gnome-desktop-gdk_functions.patch to fix build with latest
gtk3. Patch from upstream git, commit 260f6d, 24863a & ff299b.
-------------------------------------------------------------------
Sat Dec 11 11:40:50 CET 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-desktop (Version 2.91.3)
# spec file for package gnome-desktop (Version 2.91.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,17 +19,14 @@
%define IS_DEFAULT_GNOME_DESKTOP 0
Name: gnome-desktop
Version: 2.91.3
Release: 2
# FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-11)
Version: 2.91.4
Release: 1
License: LGPLv2.1+
Summary: The GNOME Desktop API Library
Url: http://www.gnome.org
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch2: gnome-desktop-desktop.patch
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
@ -49,19 +46,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
This package contains the gnome-about program as well as some
desktop-wide documents.
%if %IS_DEFAULT_GNOME_DESKTOP
%package -n gnome-about
License: GPLv2+
Summary: Information dialog about GNOME
Group: System/GUI/GNOME
Recommends: %{name}-lang
%description -n gnome-about
The gnome-about program helps find which version of GNOME is
installed.
%endif
%package -n libgnome-desktop-3-0
License: LGPLv2.1+
Summary: The GNOME Desktop API Library
@ -103,18 +87,14 @@ gtk-doc.
%prep
%setup -q
translation-update-upstream
%patch2 -p0
%build
%configure --with-pic\
--disable-static\
--disable-scrollkeeper\
--with-gnome-distributor="SUSE"\
%if ! %IS_DEFAULT_GNOME_DESKTOP
--disable-gnome-about \
--disable-desktop-docs \
%endif
--disable-date-in-gnome-version
--disable-scrollkeeper
make %{?jobs:-j%jobs}
%install
@ -125,10 +105,9 @@ make %{?jobs:-j%jobs}
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# FIXME: waiting for https://bugzilla.novell.com/show_bug.cgi?id=659001 ; once the bug is resolved, remove the comment for %if
#%if 0%{?suse_version} <= 1130
%if 0%{?suse_version} <= 1130
%{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*
#%endif
%endif
%find_lang %{name}-3.0
%if %IS_DEFAULT_GNOME_DESKTOP
%find_lang fdl %{name}-3.0.lang
@ -146,17 +125,6 @@ rm -rf %{buildroot}
%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig
%if %IS_DEFAULT_GNOME_DESKTOP
%files -n gnome-about
%defattr (-, root, root)
%doc COPYING
%{_bindir}/gnome-about
%{_datadir}/applications/gnome-about.desktop
%{_datadir}/gnome-about/
%doc %{_mandir}/man1/gnome-about.1*
%endif
%files -n libgnome-desktop-3-0
%defattr(-, root, root)
%doc AUTHORS COPYING.LIB NEWS README