[packages/gnome-desktop] Update to 3.10.1
megabajt
megabajt at pld-linux.org
Wed Oct 16 22:33:14 CEST 2013
commit f12bc176e73de530ad6f97726ca38e8853435122
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Wed Oct 16 22:33:01 2013 +0200
Update to 3.10.1
gnome-desktop-system-locale-archive-path.patch | 21 ---------------------
gnome-desktop.spec | 6 ++----
2 files changed, 2 insertions(+), 25 deletions(-)
---
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 00b6733..c15c9ec 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,13 +1,12 @@
Summary: gnome-desktop library
Summary(pl.UTF-8): Biblioteka gnome-desktop
Name: gnome-desktop
-Version: 3.10.0
+Version: 3.10.1
Release: 1
License: LGPL
Group: X11/Applications
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.10/%{name}-%{version}.tar.xz
-# Source0-md5: d9fd5ab4f8432c0a8876ed950565e0fb
-Patch0: %{name}-system-locale-archive-path.patch
+# Source0-md5: 97cc7a69b1f9bc67d0e2c591627028bc
URL: http://www.gnome.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.11
@@ -94,7 +93,6 @@ Dokumentacja API gnome-desktop.
%prep
%setup -q
-%patch0 -p1
%build
%{__gtkdocize}
diff --git a/gnome-desktop-system-locale-archive-path.patch b/gnome-desktop-system-locale-archive-path.patch
deleted file mode 100644
index bc88dc3..0000000
--- a/gnome-desktop-system-locale-archive-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gnome-desktop-3.8.0/libgnome-desktop/gnome-languages.c.old 2013-03-27 17:34:23.246509092 +0100
-+++ gnome-desktop-3.8.0/libgnome-desktop/gnome-languages.c 2013-03-27 17:35:21.219529069 +0100
-@@ -47,7 +47,7 @@
- #include "locarchive.h"
-
- #define ARCHIVE_FILE LIBLOCALEDIR "/locale-archive"
--#define SYSTEM_ARCHIVE_FILE "/usr/lib/locale/locale-archive"
-+#define SYSTEM_ARCHIVE_FILE LIBDIR "/locale/locale-archive"
- #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
- #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-
---- gnome-desktop-3.8.0/libgnome-desktop/Makefile.am.old 2013-03-27 17:35:31.116142122 +0100
-+++ gnome-desktop-3.8.0/libgnome-desktop/Makefile.am 2013-03-27 17:35:46.609391521 +0100
-@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \
- -DISO_CODES_PREFIX=\""$(ISO_CODES_PREFIX)"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBDIR=\""$(libdir)"\" \
- -DPNP_IDS=\""$(PNP_IDS)"\" \
- -DXKB_BASE=\""$(XKB_BASE)"\" \
- $(DISABLE_DEPRECATED_CFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-desktop.git/commitdiff/f12bc176e73de530ad6f97726ca38e8853435122
More information about the pld-cvs-commit
mailing list