zeenix pushed to geoclue2 (master). "Revert "Don't install the demo .desktop files" (..more)"

[notifications at fedoraproject.org]

>From 151484988b8b3c8d586f00dbfbe495f004a5adb2 Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
Date: Tue, 7 Apr 2015 16:38:34 +0100
Subject: Revert "Don't install the demo .desktop files"

This reverts commit 14f49a5815c3e79eed39d505fd0311d1f1a99411.

In the following patch, we'll put the demo apps in a separate package.

Conflicts:
	geoclue2.spec

diff --git a/geoclue2.spec b/geoclue2.spec
index 3a2865d..962bef0 100644
--- a/geoclue2.spec
+++ b/geoclue2.spec
@@ -53,11 +53,6 @@ make %{?_smp_mflags} V=1
 # Home directory for the 'geoclue' user
 mkdir -p $RPM_BUILD_ROOT/var/lib/geoclue
 
-# Remove demo files
-rm $RPM_BUILD_ROOT%{_datadir}/applications/geoclue-demo-agent.desktop
-rm $RPM_BUILD_ROOT%{_datadir}/applications/geoclue-where-am-i.desktop
-rm $RPM_BUILD_ROOT%{_libexecdir}/geoclue-2.0/demos/where-am-i
-
 
 %pre
 # Update the home directory for existing users
@@ -89,6 +84,8 @@ exit 0
 %{_datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service
 %{_unitdir}/geoclue.service
 %attr(755,geoclue,geoclue) %dir /var/lib/geoclue
+%{_datadir}/applications/geoclue-demo-agent.desktop
+%{_datadir}/applications/geoclue-where-am-i.desktop
 
 %files devel
 %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2*.xml
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/geoclue2.git/commit/?h=master&id=151484988b8b3c8d586f00dbfbe495f004a5adb2