leigh123linux pushed to cinnamon-control-center (master). "fix schema path"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 28 22:16:20 UTC 2015


From eae775920a5ea03e511e22fc5d720a141205498e Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Thu, 28 May 2015 23:16:04 +0100
Subject: fix schema path


diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index f27e832..5e094c7 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -9,7 +9,7 @@
 Summary: Utilities to configure the Cinnamon desktop
 Name:    cinnamon-control-center
 Version: 2.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The following files contain code from
 # ISC for panels/network/rfkill.h
 # And MIT for wacom/calibrator/calibrator.c
@@ -26,6 +26,7 @@ URL:     http://cinnamon.linuxmint.com
 #Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-control-center/source/cinnamon-control-center-%%{version}.git%%{_internal_version}.tar.gz
 Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-control-center/source/cinnamon-control-center-%{version}.tar.gz
 Source1: http://packages.linuxmint.com/pool/main/m/mint-artwork-cinnamon/mint-artwork-cinnamon_%{_artwork_version}.tar.gz
+Patch0:  fix_path.patch
 
 Requires: cinnamon-settings-daemon >= %{csd_version}
 Requires: redhat-menus >= %{redhat_menus_version}
@@ -115,17 +116,16 @@ utilities for testing Metacity/Muffin themes.
 
 %prep
 %setup -q
+%patch0 -p1
 tar -xf %{SOURCE1}
 NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure \
         --disable-static \
-        --disable-update-mimedb \
         --with-libsocialweb=no \
         --enable-systemd \
-        --disable-cups \
-        --enable-ibus
+        --disable-cups
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -134,7 +134,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dyn
 make V=1 %{?_smp_mflags}
 
 %install
-%make_install
+%{make_install}
   
 desktop-file-install                                    \
   --delete-original                                     \
@@ -207,6 +207,9 @@ fi
 %{_libdir}/pkgconfig/libcinnamon-control-center.pc
 
 %changelog
+* Thu May 28 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-3
+- fix schema path
+
 * Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-2
 - re-add dist tag
 
diff --git a/fix_path.patch b/fix_path.patch
new file mode 100644
index 0000000..8693c2c
--- /dev/null
+++ b/fix_path.patch
@@ -0,0 +1,11 @@
+--- a/panels/network/wireless-security/eap-method.c	2015-05-19 16:23:24.000000000 +0100
++++ b/panels/network/wireless-security/eap-method.c	2015-05-28 23:03:53.982718448 +0100
+@@ -118,7 +118,7 @@ _get_ca_ignore_settings (const char *uui
+ 	GSettings *settings;
+ 	char *path = NULL;
+ 
+-	path = g_strdup_printf ("/org/cinnamon/nm-applet/eap/%s/", uuid);
++	path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
+ 	settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
+ 	g_free (path);
+ 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon-control-center.git/commit/?h=master&id=eae775920a5ea03e511e22fc5d720a141205498e


More information about the scm-commits mailing list