bruno pushed to gnubik (f22). "Skip install-desktop (..more)"

[notifications at fedoraproject.org]

From 95f0eb7385efcd062dd40b4373813334cf913f95 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno at wolff.to>
Date: Sat, 16 May 2015 20:34:01 -0500
Subject: Skip install-desktop

The install-desktop target tries to write to /usr/share without
applying the destination directory. The whole thing looks odd.

diff --git a/gnubik.spec b/gnubik.spec
index ebdbaa5..7a0ad5c 100644
--- a/gnubik.spec
+++ b/gnubik.spec
@@ -10,6 +10,8 @@ Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 # There aren't 24x24 logo icons provided
 Patch1:         iconfix.patch
+# The install-desktop target is broken
+Patch2:         installfix.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  libX11-devel guile-devel libGL-devel libGLU-devel gtk2-devel gtkglext-devel
@@ -26,6 +28,7 @@ an image of a magic cube (similar to a rubik cube) and you attempt to solve it.
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p0
 chmod -x src/{quarternion,txfm}.{c,h}
 # Remove pregenerated binaries and let them be gerenerated
 rm po/*.pot
@@ -95,6 +98,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Error message patch is no longer needed
 - Some translation improvements
 - Needed to not try to install missing 24x24 logo
+- install-desktop target in makefile is broken
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/installfix.patch b/installfix.patch
new file mode 100644
index 0000000..d8de6e0
--- /dev/null
+++ b/installfix.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2015-05-16 20:21:16.518550494 -0500
++++ Makefile.in	2015-05-16 20:23:47.147694684 -0500
+@@ -485,7 +485,7 @@
+ context = apps
+ sizes = 16 22 32 48
+ desktopdir = $(datadir)/applications
+-INSTALL_DATA_HOOKS = install-icons install-desktop
++INSTALL_DATA_HOOKS = install-icons
+ UNINSTALL_DATA_HOOKS = uninstall-icons uninstall-desktop
+ desktop_DATA = icons/gen-dot-desktop.scm
+ ACLOCAL_AMFLAGS = -I m4
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnubik.git/commit/?h=f22&id=95f0eb7385efcd062dd40b4373813334cf913f95