commit 9599707f7d469c2d42c7123d83a6625d427a9217
Author: Marcin Banasiak <[email protected]>
Date: Wed Mar 27 17:42:45 2013 +0100
Fix path to locale-archive. Release 2
gnome-desktop-system-locale-archive-path.patch | 21 +++++++++++++++++++++
gnome-desktop.spec | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index f835caa..4e66d24 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -2,11 +2,12 @@ Summary: gnome-desktop library
Summary(pl.UTF-8): Biblioteka gnome-desktop
Name: gnome-desktop
Version: 3.8.0
-Release: 1
+Release: 2
License: LGPL
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.8/%{name}-%{version}.tar.xz
# Source0-md5: 67cdf987d1d9a4b515bb933eeb0bf726
+Patch0: %{name}-system-locale-archive-path.patch
URL: http://www.gnome.org/
BuildRequires: autoconf
BuildRequires: automake >= 1:1.11
@@ -88,6 +89,7 @@ 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
new file mode 100644
index 0000000..bc88dc3
--- /dev/null
+++ b/gnome-desktop-system-locale-archive-path.patch
@@ -0,0 +1,21 @@
+--- 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/9599707f7d469c2d42c7123d83a6625d427a9217
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
