packages: libgnomekbd/libgnomekbd.spec, libgnomekbd/libgnomekbd-install.pat...

[megabajt]

Author: megabajt                     Date: Fri Apr 13 15:56:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.4.0.2
- added -install.patch to fix problems with install (patch from upstream)

---- Files affected:
packages/libgnomekbd:
   libgnomekbd.spec (1.28 -> 1.29) , libgnomekbd-install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libgnomekbd/libgnomekbd.spec
diff -u packages/libgnomekbd/libgnomekbd.spec:1.28 packages/libgnomekbd/libgnomekbd.spec:1.29
--- packages/libgnomekbd/libgnomekbd.spec:1.28	Mon Mar 26 08:37:51 2012
+++ packages/libgnomekbd/libgnomekbd.spec	Fri Apr 13 17:56:20 2012
@@ -2,12 +2,13 @@
 Summary:	A keyboard configuration library
 Summary(pl.UTF-8):	Biblioteka do konfiguracji klawiatury
 Name:		libgnomekbd
-Version:	3.4.0.1
+Version:	3.4.0.2
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/3.4/%{name}-%{version}.tar.xz
-# Source0-md5:	f23958a75a672ab5c3a1783df275252f
+# Source0-md5:	9772d124e0cca6a70b9e7cf85032a297
+Patch0:		%{name}-install.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.9
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__glib_gettextize}
@@ -137,6 +139,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2012/04/13 15:56:20  megabajt
+- updated to 3.4.0.2
+- added -install.patch to fix problems with install (patch from upstream)
+
 Revision 1.28  2012/03/26 06:37:51  megabajt
 - updated to 3.4.0.1
 

================================================================
Index: packages/libgnomekbd/libgnomekbd-install.patch
diff -u /dev/null packages/libgnomekbd/libgnomekbd-install.patch:1.1
--- /dev/null	Fri Apr 13 17:56:25 2012
+++ packages/libgnomekbd/libgnomekbd-install.patch	Fri Apr 13 17:56:20 2012
@@ -0,0 +1,37 @@
+From 367f3378cc579e8dd131ffcc717a337915e06519 Mon Sep 17 00:00:00 2001
+From: Alban Browaeys <prahal at yahoo.com>
+Date: Tue, 10 Apr 2012 10:35:18 +0000
+Subject: install : fix install with a DESTDIR (jhbuild)
+
+Spurious double quotes around uidir and iconsdir makes
+install attempt to install in '<DESTDIR>"<iconsdir>"'
+ie
+'/opt/gnome/_jhbuild/root-libgnomekbd\"/opt/gnome/share/libgnomekb/icons\"'
+
+Then install fails to install the data files into the correct directory:
+'/opt/gnome/_jhbuild/root-libgnomekbd/opt/gnome/share/libgnomekb/icons'.
+It looks like the for loop to install items expands the icons and ui
+dirs while the mkdir -p does not.
+
+Fix this issue by removing the double quotes in th Makefile.am around
+the iconsdir and uidir assignments.
+---
+diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
+index ed71260..6246760 100644
+--- a/libgnomekbd/Makefile.am
++++ b/libgnomekbd/Makefile.am
+@@ -2,10 +2,10 @@ bin_PROGRAMS=gkbd-keyboard-display
+ 
+ lib_LTLIBRARIES = libgnomekbd.la libgnomekbdui.la
+ 
+-uidir="$(pkgdatadir)/ui"
++uidir=$(pkgdatadir)/ui
+ ui_DATA = show-layout.ui
+ 
+-iconsdir="$(pkgdatadir)/icons"
++iconsdir=$(pkgdatadir)/icons
+ icons_DATA = kbdled-caps-lock.svg \
+              kbdled-num-lock.svg \
+              kbdled-scroll-lock.svg 
+--
+cgit v0.9.0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libgnomekbd/libgnomekbd.spec?r1=1.28&r2=1.29