From 5b147d2c4e0b797252729575d671b76eba367a89 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Sun, 7 Dec 2014 09:06:59 +0700
Subject: Incorporate some review feedback

---
 desktop/budgie-desktop.spec | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'desktop')

diff --git a/desktop/budgie-desktop.spec b/desktop/budgie-desktop.spec
index 1b322a9..131dc75 100644
--- a/desktop/budgie-desktop.spec
+++ b/desktop/budgie-desktop.spec
@@ -1,11 +1,14 @@
 Name:           budgie-desktop
 Version:        8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An elegant desktop with GNOME integration
 
 License:        GPLv2+
 URL:            https://github.com/evolve-os/budgie-desktop
 Source0:        https://build.opensuse.org/source/home:ikeydoherty:evolve/budgie-desktop/budgie-desktop-%{version}.tar.xz
+# Propagate configuration parameters to budgie-1.0.pc.in
+# https://github.com/evolve-os/budgie-desktop/pull/124
+Patch0:         budgie-desktop-8-fix-pkgconfig.patch
 
 BuildRequires:  vala >= 0.22
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.38.0
@@ -21,7 +24,8 @@ BuildRequires:  pkgconfig(libpeas-gtk-1.0) >= 1.8.0
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.38.0
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  chrpath
-#Requires:       
+
+BuildRequires:  desktop-file-utils
 
 %description
 Budgie is the flagship desktop of the Evolve OS Linux Distribution,
@@ -44,15 +48,11 @@ Development files for the Budgie Desktop
 
 %prep
 %setup -q
-# Adjust for Fedora's multilib directory layout
-%{__sed} -i 's|libdir=${exec_prefix}/lib|libdir=${libdir}|' \
-         budgie-plugin/budgie-1.0.pc.in
+%patch0 -p1 -b .fix-pkgconfig
 
 
 %build
-%configure
-# sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-# sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%configure --disable-silent-rules
 make %{?_smp_mflags}
 
 
@@ -64,6 +64,10 @@ chrpath --delete %{buildroot}%{_libdir}/*.so
 chrpath --delete %{buildroot}%{_bindir}/*
 chrpath --delete %{buildroot}%{_libdir}/budgie-desktop/*.so
 
+# Validate installed desktop file
+desktop-file-validate %{buildroot}/%{_datadir}/xsessions/budgie-desktop.desktop
+
+
 %post -p /sbin/ldconfig
 
 %postun
@@ -90,15 +94,24 @@ fi
 %{_datadir}/budgie-desktop/layout.ini
 %{_datadir}/xsessions/budgie-desktop.desktop
 %{_datadir}/glib-2.0/schemas/com.evolve-os.budgie.panel.gschema.xml
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Budgie-1.0.gir
 
 %files devel
 %{_includedir}/BudgiePlugin.h
 %{_libdir}/pkgconfig/budgie*.pc
 %{_libdir}/lib*.so
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/budgie-1.0.*
 
 
 %changelog
+* Sun Dec  7 2014 Michel Alexandre Salim <salimma@fedoraproject.org> - 8-2
+- Propagate configuration parameters to budgie-1.0.pc.in
+- Validate the Budgie desktop session file
+- Verbose build output
+- Fix directory ownerships
+
 * Fri Dec  5 2014 Michel Alexandre Salim <salimma@fedoraproject.org> - 8-1
 - Initial package
-- 
cgit