Updated to 3.6.0. Removed applied upstream -install.patch

diff --git a/libgnomekbd-install.patch b/libgnomekbd-install.patch
deleted file mode 100644 (file)
index d15f1a1..0000000
--- a/libgnomekbd-install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 367f3378cc579e8dd131ffcc717a337915e06519 Mon Sep 17 00:00:00 2001
-From: Alban Browaeys <prahal@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

diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index e9a2b8d4098c7bdc2dbecaa806114e2d75811253..a61d8275e1cfab105ed890faac4101c274401fd0 100644 (file)
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,13 +1,12 @@
 Summary:       A keyboard configuration library
 Summary(pl.UTF-8):     Biblioteka do konfiguracji klawiatury
 Name:          libgnomekbd
-Version:       3.4.0.2
+Version:       3.6.0
 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: 9772d124e0cca6a70b9e7cf85032a297
-Patch0:                %{name}-install.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/3.6/%{name}-%{version}.tar.xz
+# Source0-md5: 2f000ed5aa11454936c846a784e484c7
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.9
@@ -68,7 +67,6 @@ Statyczna biblioteka libgnomekbd.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__glib_gettextize}
@@ -110,9 +108,9 @@ fi
 %doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/gkbd-keyboard-display
 %attr(755,root,root) %{_libdir}/libgnomekbd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnomekbd.so.7
+%attr(755,root,root) %ghost %{_libdir}/libgnomekbd.so.8
 %attr(755,root,root) %{_libdir}/libgnomekbdui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnomekbdui.so.7
+%attr(755,root,root) %ghost %{_libdir}/libgnomekbdui.so.8
 %{_desktopdir}/gkbd-keyboard-display.desktop
 %{_datadir}/GConf/gsettings/libgnomekbd.convert
 %{_datadir}/glib-2.0/schemas/*.gschema.xml