This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
ef50899896
commit
8ca5a0fcd4
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9
|
||||
size 3186127
|
||||
3
gnome-desktop-2.26.1.tar.bz2
Normal file
3
gnome-desktop-2.26.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0341c77360dbb23fbad61987ce9f78f9bfc11ac12e48f60cb049359b4b76d7d
|
||||
size 3228329
|
||||
@ -1,113 +0,0 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (révision 5453)
|
||||
+++ configure.in (révision 5455)
|
||||
@@ -45,11 +45,25 @@ if test "x$with_gnome_distributor" != x
|
||||
GNOME_DISTRIBUTOR=$with_gnome_distributor
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE([date-in-gnome-version],
|
||||
+ [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
|
||||
+ [],[enable_date_in_gnome_version=yes])
|
||||
+if test "$enable_date_in_gnome_version" = "no"; then
|
||||
+ GNOME_DATE=
|
||||
+ GNOME_DATE_COMMENT_START="<!--"
|
||||
+ GNOME_DATE_COMMENT_END="-->"
|
||||
+else
|
||||
+ GNOME_DATE_COMMENT_START=
|
||||
+ GNOME_DATE_COMMENT_END=
|
||||
+fi
|
||||
+
|
||||
AC_SUBST(GNOME_PLATFORM)
|
||||
AC_SUBST(GNOME_MINOR)
|
||||
AC_SUBST(GNOME_MICRO)
|
||||
AC_SUBST(GNOME_DISTRIBUTOR)
|
||||
AC_SUBST(GNOME_DATE)
|
||||
+AC_SUBST(GNOME_DATE_COMMENT_START)
|
||||
+AC_SUBST(GNOME_DATE_COMMENT_END)
|
||||
|
||||
GNOME_COMMON_INIT
|
||||
GNOME_DEBUG_CHECK
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
--- ChangeLog (révision 5453)
|
||||
+++ ChangeLog (révision 5455)
|
||||
@@ -1,3 +1,18 @@
|
||||
+2009-03-27 Vincent Untz <vuntz@gnome.org>
|
||||
+
|
||||
+ * configure.in:
|
||||
+ * gnome-version.xml.in.in: add a --disable-date-in-gnome-version
|
||||
+ configure option to not put the build date in gnome-version.xml. The
|
||||
+ build date is actually not that useful since it's not the build date
|
||||
+ for all of GNOME, but for this specific package. So it can be
|
||||
+ confusing.
|
||||
+
|
||||
+2009-03-26 Vincent Untz <vuntz@gnome.org>
|
||||
+
|
||||
+ * gnome-about/gnome-about.in: make the code returning the content of
|
||||
+ gnome-version.xml a bit more solid, so that we can handle a file
|
||||
+ that doesn't contain the date, the distributor or the version.
|
||||
+
|
||||
2009-03-16 Vincent Untz <vuntz@gnome.org>
|
||||
|
||||
* configure.in: post-release bump to 2.26.1
|
||||
Index: gnome-version.xml.in.in
|
||||
===================================================================
|
||||
--- gnome-version.xml.in.in (révision 5453)
|
||||
+++ gnome-version.xml.in.in (révision 5455)
|
||||
@@ -4,7 +4,7 @@
|
||||
<minor>@GNOME_MINOR@</minor>
|
||||
<micro>@GNOME_MICRO@</micro>
|
||||
<distributor>@GNOME_DISTRIBUTOR@</distributor>
|
||||
- <date>@GNOME_DATE@</date>
|
||||
+ @GNOME_DATE_COMMENT_START@<date>@GNOME_DATE@</date>@GNOME_DATE_COMMENT_END@
|
||||
<description>
|
||||
<!-- NOTE TO AUTHORS: Do not put anything in the following paragraphs that
|
||||
will be substituted by the configure script. Otherwise you will break
|
||||
Index: gnome-about/gnome-about.in
|
||||
===================================================================
|
||||
--- gnome-about/gnome-about.in (révision 5453)
|
||||
+++ gnome-about/gnome-about.in (révision 5455)
|
||||
@@ -86,7 +86,7 @@ def cleanup_date (date):
|
||||
# FIXME: we don't have g_locale_to_utf8 in python. See bug #530382
|
||||
return unicode (time.strftime ("%x", time.strptime (date, "%Y-%m-%d")), locale.getpreferredencoding ()).encode ("utf-8")
|
||||
except:
|
||||
- return False
|
||||
+ return ""
|
||||
|
||||
# Imported from GNOME's Sabayon
|
||||
# (sabayon/admin-tool/lockdown/disabledapplets.py)
|
||||
@@ -965,7 +965,9 @@ contributors list) correctly positionned
|
||||
self.load_description_messages (node)
|
||||
|
||||
'''Format version'''
|
||||
- if not len (infos["minor"]):
|
||||
+ if not len (infos["platform"]):
|
||||
+ version = ""
|
||||
+ elif not len (infos["minor"]):
|
||||
version = infos["platform"]
|
||||
elif not len (infos["micro"]):
|
||||
version = "%s.%s" % (infos["platform"], infos["minor"])
|
||||
@@ -973,11 +975,17 @@ contributors list) correctly positionned
|
||||
version = "%s.%s.%s" % (infos["platform"], infos["minor"],
|
||||
infos["micro"])
|
||||
|
||||
- return [
|
||||
- (_("Version"), version),
|
||||
- (_("Distributor"), infos["distributor"]),
|
||||
- (_("Build Date"), cleanup_date (infos["date"]))
|
||||
- ]
|
||||
+ date = cleanup_date (infos["date"])
|
||||
+
|
||||
+ retval = []
|
||||
+ if version:
|
||||
+ retval.append((_("Version"), version))
|
||||
+ if infos["distributor"]:
|
||||
+ retval.append((_("Distributor"), infos["distributor"]))
|
||||
+ if date:
|
||||
+ retval.append((_("Build Date"), date))
|
||||
+
|
||||
+ return retval
|
||||
|
||||
def load_description_messages (self, node):
|
||||
'''Find the best translation of each description message'''
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 14 15:30:42 CEST 2009 - vuntz@novell.com
|
||||
|
||||
- Update to version 2.26.1:
|
||||
+ libgnome-desktop
|
||||
- GnomeBG: handle X errors when the root properties point to
|
||||
something wrong when getting the root pixmap
|
||||
- GnomeRR: use XRRGetScreenResourcesCurrent() from RANDR 1.3
|
||||
when possible, when we only need to fetch the current RANDR
|
||||
status
|
||||
+ gnome-about
|
||||
- Make parsing of gnome-version.xml more tolerant against
|
||||
missing fields
|
||||
+ Misc
|
||||
- Add a --disable-date-in-gnome-version configure option to
|
||||
remove the build date from gnome-version.xml
|
||||
- Remove unused --with-kde-datadir configure option
|
||||
- Drop gnome-desktop-no-date-in-version.patch: fixed upstream. Also
|
||||
disable autoreconf and remove gnome-common BuildRequires (that
|
||||
were added for this patch).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 27 20:35:44 CET 2009 - vuntz@novell.com
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gnome-desktop (Version 2.26.0)
|
||||
# spec file for package gnome-desktop (Version 2.26.1)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -21,7 +21,6 @@
|
||||
Name: gnome-desktop
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gconf2-devel
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gnome-doc-utils-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: intltool
|
||||
@ -31,8 +30,8 @@ BuildRequires: update-desktop-files
|
||||
License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later
|
||||
Group: System/GUI/GNOME
|
||||
Obsoletes: gnome-core
|
||||
Version: 2.26.0
|
||||
Release: 2
|
||||
Version: 2.26.1
|
||||
Release: 1
|
||||
Summary: The GNOME Desktop API Library
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Url: http://www.gnome.org
|
||||
@ -43,8 +42,6 @@ Patch2: gnome-desktop-desktop.patch
|
||||
Patch3: gnome-desktop-recently-used-apps.patch
|
||||
# PATCH-FEATURE-OPENSUSE gnome-desktop-fate300461-desktop-gettext.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext
|
||||
Patch5: gnome-desktop-fate300461-desktop-gettext.patch
|
||||
# PATCH-FEATURE-UPSTREAM gnome-desktop-no-date-in-version.patch vuntz@novell.com -- Be more build-compare friendly with --disable-date-in-gnome-version
|
||||
Patch6: gnome-desktop-no-date-in-version.patch
|
||||
Requires: %{name}-lang = %{version}
|
||||
Requires: libgnome-desktop-2-11 = %{version}
|
||||
|
||||
@ -116,12 +113,8 @@ translation-update-upstream
|
||||
%patch2 -p0
|
||||
%patch3 -p1
|
||||
%patch5 -p0
|
||||
# Note: this patch requires autoreconf
|
||||
%patch6 -p0
|
||||
|
||||
%build
|
||||
# Note: autoreconf requires gnome-common BuildRequires
|
||||
autoreconf -f -i
|
||||
%configure --with-pic\
|
||||
--disable-static\
|
||||
--disable-scrollkeeper\
|
||||
@ -179,6 +172,24 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/gtk-doc/html/gnome-desktop
|
||||
|
||||
%changelog
|
||||
* Tue Apr 14 2009 vuntz@novell.com
|
||||
- Update to version 2.26.1:
|
||||
+ libgnome-desktop
|
||||
- GnomeBG: handle X errors when the root properties point to
|
||||
something wrong when getting the root pixmap
|
||||
- GnomeRR: use XRRGetScreenResourcesCurrent() from RANDR 1.3
|
||||
when possible, when we only need to fetch the current RANDR
|
||||
status
|
||||
+ gnome-about
|
||||
- Make parsing of gnome-version.xml more tolerant against
|
||||
missing fields
|
||||
+ Misc
|
||||
- Add a --disable-date-in-gnome-version configure option to
|
||||
remove the build date from gnome-version.xml
|
||||
- Remove unused --with-kde-datadir configure option
|
||||
- Drop gnome-desktop-no-date-in-version.patch: fixed upstream. Also
|
||||
disable autoreconf and remove gnome-common BuildRequires (that
|
||||
were added for this patch).
|
||||
* Fri Mar 27 2009 vuntz@novell.com
|
||||
- Add gnome-desktop-no-date-in-version.patch to be more
|
||||
build-compare-friendly, and use new
|
||||
@ -315,7 +326,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Update gnome-desktop-fate300461-desktop-gettext.patch to make it
|
||||
able to load translations from the desktop-translations package.
|
||||
This is part of fate#300461 again.
|
||||
* Wed Sep 10 2008 federico@novell.com
|
||||
* Thu Sep 11 2008 federico@novell.com
|
||||
- Added gnome-desktop-randr-cloned-outputs.diff to provide
|
||||
infrastructure needed to support switching display output modes on
|
||||
laptops with the Fn-F7 (XF86Display) hotkey. The actual handling of
|
||||
@ -398,7 +409,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Mon Apr 21 2008 vuntz@suse.de
|
||||
- Rewrite gnome-desktop-recently-used-apps.patch so that it
|
||||
applies.
|
||||
* Thu Apr 10 2008 maw@suse.de
|
||||
* Fri Apr 11 2008 maw@suse.de
|
||||
- Update to version 2.22.1:
|
||||
+ Fix some compiler warnings
|
||||
+ Handle start time in the future correctly in GnomeBG
|
||||
@ -411,7 +422,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Fri Mar 14 2008 maw@suse.de
|
||||
- Update to version 2.22.0:
|
||||
+ Updated translations.
|
||||
* Tue Mar 04 2008 maw@suse.de
|
||||
* Wed Mar 05 2008 maw@suse.de
|
||||
- Update to version 2.21.92:
|
||||
+ libgnome-desktop:
|
||||
* Fix crash in GnomeBG
|
||||
@ -438,7 +449,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
+ Add GNOME_DESKTOP_USE_UNSTABLE_API API guard
|
||||
+ Updated translations
|
||||
- Build with -fno-strict-aliasing.
|
||||
* Thu Jan 24 2008 rodrigo@suse.de
|
||||
* Fri Jan 25 2008 rodrigo@suse.de
|
||||
- Updated to GNOME 2.21.5 version:
|
||||
* gnome-about: Don't keep the window centered
|
||||
* gnome-about: Fix problem when the color of the logo is wrong
|
||||
@ -458,7 +469,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Update to version 2.19.92:
|
||||
+ Updated translations.
|
||||
+ Updated README
|
||||
* Thu Aug 30 2007 maw@suse.de
|
||||
* Fri Aug 31 2007 maw@suse.de
|
||||
- Update to version 2.19.90:
|
||||
+ Updated translations.
|
||||
* Tue Aug 14 2007 maw@suse.de
|
||||
@ -468,7 +479,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Use %%fdupes
|
||||
- Split off a -lang subpackage
|
||||
- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
|
||||
* Thu Aug 02 2007 mauro@suse.de
|
||||
* Fri Aug 03 2007 mauro@suse.de
|
||||
- Update to version 2.19.6
|
||||
- Dependencies fixes.
|
||||
* Fri Jul 06 2007 maw@suse.de
|
||||
@ -495,7 +506,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Update to version 2.17.91.
|
||||
* Wed Feb 07 2007 sbrabec@suse.cz
|
||||
- Do not build unusable static libraries (#238552).
|
||||
* Sun Jan 07 2007 sbrabec@suse.cz
|
||||
* Mon Jan 08 2007 sbrabec@suse.cz
|
||||
- Splitted gnome-desktop-doc from gnome-desktop.
|
||||
* Thu Dec 14 2006 maw@suse.de
|
||||
- Move to /usr
|
||||
@ -511,7 +522,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Mon Oct 02 2006 jhargadon@suse.de
|
||||
- update to version 2.16.1
|
||||
- updated translations
|
||||
* Wed Sep 13 2006 jhargadon@suse.de
|
||||
* Thu Sep 14 2006 jhargadon@suse.de
|
||||
- update to version 2.16.0
|
||||
- updated translations
|
||||
* Tue Sep 12 2006 danw@suse.de
|
||||
@ -536,14 +547,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
screen
|
||||
* Mon May 08 2006 jimmyk@suse.de
|
||||
- Fix recently-used-apps patch, colliding libegg symbols (BNC #158106).
|
||||
* Mon Mar 20 2006 danw@suse.de
|
||||
* Tue Mar 21 2006 danw@suse.de
|
||||
- Fix the error message mentioned in #156801 (though not the dialog
|
||||
box, which turns out to be a separate bug).
|
||||
* Tue Feb 28 2006 jimmyk@suse.de
|
||||
* Wed Mar 01 2006 jimmyk@suse.de
|
||||
- Added .recently-used-apps support (BNC #152405)
|
||||
* Tue Feb 28 2006 sbrabec@suse.cz
|
||||
- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
|
||||
* Mon Feb 27 2006 ro@suse.de
|
||||
* Tue Feb 28 2006 ro@suse.de
|
||||
- added kdelibs3-devel-doc to BuildRequires
|
||||
* Sat Feb 04 2006 aj@suse.de
|
||||
- Reduce BuildRequires.
|
||||
@ -554,11 +565,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Wed Nov 16 2005 sbrabec@suse.cz
|
||||
- Fixed X-KDE-SubstituteUID patch for commands with arguments
|
||||
(#133942).
|
||||
* Wed Oct 12 2005 gekker@suse.de
|
||||
* Thu Oct 13 2005 gekker@suse.de
|
||||
- Update to version 2.12.1
|
||||
* Mon Sep 05 2005 rodrigo@suse.de
|
||||
- Update to version 2.12.0
|
||||
* Mon Aug 22 2005 gekker@suse.de
|
||||
* Tue Aug 23 2005 gekker@suse.de
|
||||
- Update to version 2.11.92
|
||||
* Tue Aug 02 2005 gekker@suse.de
|
||||
- Update to version 2.11.90
|
||||
@ -662,7 +673,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Thu Nov 28 2002 hhetter@suse.de
|
||||
- updated to version 2.0.10 [GNOME 2.0.3]
|
||||
- removed hu-translation because translations have been updated
|
||||
* Mon Nov 11 2002 ro@suse.de
|
||||
* Tue Nov 12 2002 ro@suse.de
|
||||
- changed neededforbuild <xf86 xdevel> to <x-devel-packages>
|
||||
* Tue Sep 24 2002 sbrabec@suse.cz
|
||||
- Added alsa-devel to neededforbuild, because esound-devel can require it.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user