pool/gnome-desktop
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=50

Browse Source
This commit is contained in:
OBS User unknown 2009-04-01 15:16:20 +00:00 committed by Git OBS Bridge
parent 0e9af6f079
commit ef50899896
3 changed files with 140 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
gnome-desktop-no-date-in-version.patch Normal file
View File

@ -0,0 +1,113 @@
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'''

10
gnome-desktop.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Mar 27 20:35:44 CET 2009 - vuntz@novell.com
- Add gnome-desktop-no-date-in-version.patch to be more
build-compare-friendly, and use new
--disable-date-in-gnome-version configure option.
- Enable autoreconf for the patch, and add gnome-common
BuildRequires.
- Remove -fno-strict-aliasing from CFLAGS.
-------------------------------------------------------------------
Tue Mar 17 01:12:40 CET 2009 - vuntz@novell.com

21
gnome-desktop.spec
View File

@ -21,6 +21,7 @@
Name: gnome-desktop
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
@ -31,7 +32,7 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 o
Group: System/GUI/GNOME
Obsoletes: gnome-core
Version: 2.26.0
Release: 1
Release: 2
Summary: The GNOME Desktop API Library
Source: %{name}-%{version}.tar.bz2
Url: http://www.gnome.org
@ -42,6 +43,8 @@ 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}
@ -113,14 +116,17 @@ translation-update-upstream
%patch2 -p0
%patch3 -p1
%patch5 -p0
# Note: this patch requires autoreconf
%patch6 -p0
%build
#autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# Note: autoreconf requires gnome-common BuildRequires
autoreconf -f -i
%configure --with-pic\
--disable-static\
--disable-scrollkeeper\
--with-gnome-distributor="SUSE"
--with-gnome-distributor="SUSE"\
--disable-date-in-gnome-version
make %{?jobs:-j%jobs}
%install
@ -173,6 +179,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/gnome-desktop
%changelog
* Fri Mar 27 2009 vuntz@novell.com
- Add gnome-desktop-no-date-in-version.patch to be more
build-compare-friendly, and use new
--disable-date-in-gnome-version configure option.
- Enable autoreconf for the patch, and add gnome-common
BuildRequires.
- Remove -fno-strict-aliasing from CFLAGS.
* Tue Mar 17 2009 vuntz@novell.com
- Update to version 2.26.0:
+ GnomeRR: grab the X server while tweaking the RANDR