leigh123linux pushed to cinnamon-control-center (f21). "Merge branch 'master' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 11:06:56 UTC 2015
From ff8e17d4123fd6db020e7b15a85ee3d4a1aefb5b Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 16:28:12 +0100
Subject: update to git snapshot
diff --git a/.gitignore b/.gitignore
index 855b567..4a1c60e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/cinnamon-control-center-2.4.0.tar.gz
/cinnamon-control-center-2.4.1.tar.gz
/cinnamon-control-center-2.4.2.tar.gz
+/cinnamon-control-center-2.5.0.git0febe4d.tar.gz
diff --git a/0001-Remove-the-NetworkManager-version-checking-altogethe.patch b/0001-Remove-the-NetworkManager-version-checking-altogethe.patch
deleted file mode 100644
index f94ee3c..0000000
--- a/0001-Remove-the-NetworkManager-version-checking-altogethe.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c53b915aec80928a1be96c6d0eb6645e415e18f9 Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux at googlemail.com>
-Date: Sun, 1 Mar 2015 08:35:52 +0000
-Subject: [PATCH] Remove the NetworkManager version checking altogether
-
----
- panels/network/cc-network-panel.c | 19 +++----------------
- 1 file changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index df64bd1..d247c90 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -1311,30 +1311,17 @@ static gboolean
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
- const gchar *version;
-- gchar **split = NULL;
-- guint major = 0;
-- guint micro = 0;
-- guint minor = 0;
- gboolean ret = TRUE;
-
- /* parse running version */
- version = nm_client_get_version (panel->priv->client);
-- if (version != NULL) {
-- split = g_strsplit (version, ".", -1);
-- major = atoi (split[0]);
-- minor = atoi (split[1]);
-- micro = atoi (split[2]);
-- }
--
-- /* is it too new or old */
-- if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
-+ if (version == NULL) {
- ret = FALSE;
-
- /* do modal dialog in idle so we don't block startup */
- panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
- }
-
-- g_strfreev (split);
- return ret;
- }
-
-@@ -1381,8 +1368,8 @@ on_toplevel_map (GtkWidget *widget,
- {
- gboolean ret;
-
-- /* is the user compiling against a new version, but running an
-- * old daemon version? */
-+ /* is the user compiling against a new version, but not running
-+ * the daemon? */
- ret = panel_check_network_manager_version (panel);
- if (ret) {
- manager_running (panel->priv->client, NULL, panel);
---
-1.9.3
-
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 4dbb493..989a11f 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -1,4 +1,4 @@
-#global _internal_version 9677670
+%global _internal_version 0febe4d
%global _artwork_version 4.4
%global csd_version 2.3.0
@@ -8,8 +8,8 @@
Summary: Utilities to configure the Cinnamon desktop
Name: cinnamon-control-center
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 0.1.git%{_internal_version}%{?dist}
# The following files contain code from
# ISC for panels/network/rfkill.h
# And MIT for wacom/calibrator/calibrator.c
@@ -23,13 +23,10 @@ URL: http://cinnamon.linuxmint.com
# wget https://github.com/linuxmint/cinnamon-control-center/archive/%%{version}.tar.gz -O cinnamon-control-center-%%{version}.tar.gz
# for git
# wget https://github.com/linuxmint/cinnamon-control-center/tarball/%%{_internal_version} -O cinnamon-control-center-%%{version}.git%%{_internal_version}.tar.gz
-#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
+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: hide_for_virtual_profiles.patch
-Patch1: 0001-Remove-the-NetworkManager-version-checking-altogethe.patch
-
Requires: cinnamon-settings-daemon >= %{csd_version}
Requires: redhat-menus >= %{redhat_menus_version}
Requires: hicolor-icon-theme
@@ -117,9 +114,7 @@ utilities for testing Metacity/Muffin themes.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n linuxmint-%{name}-%{_internal_version}
tar -xf %{SOURCE1}
NOCONFIGURE=1 ./autogen.sh
@@ -193,9 +188,7 @@ fi
%{_libdir}/cinnamon-control-center-1/panels/libdate_time.so
%{_libdir}/cinnamon-control-center-1/panels/libdisplay.so
%{_libdir}/cinnamon-control-center-1/panels/libnetwork.so
-%{_libdir}/cinnamon-control-center-1/panels/libpower.so
%{_libdir}/cinnamon-control-center-1/panels/libregion.so
-%{_libdir}/cinnamon-control-center-1/panels/libscreen.so
%{_libdir}/cinnamon-control-center-1/panels/libsoundnua.so
%{_libdir}/cinnamon-control-center-1/panels/libuniversal-access.so
%ifnarch s390 s390x
@@ -214,6 +207,9 @@ fi
%{_libdir}/pkgconfig/libcinnamon-control-center.pc
%changelog
+* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.1.git0febe4d
+- update to git snapshot
+
* Sun Mar 01 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.2-2
- remove the NetworkManager version checking altogether
diff --git a/hide_for_virtual_profiles.patch b/hide_for_virtual_profiles.patch
deleted file mode 100644
index f3c6971..0000000
--- a/hide_for_virtual_profiles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/panels/color/cc-color-panel.c 2014-11-12 00:19:37.000000000 +0000
-+++ b/panels/color/cc-color-panel.c 2014-12-01 21:59:11.260405288 +0000
-@@ -1136,7 +1136,12 @@ gcm_prefs_profile_clicked (CcColorPanel
- /* allow getting profile info */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "toolbutton_profile_view"));
-- gtk_widget_set_sensitive (widget, TRUE);
-+ if (cd_profile_get_filename (profile) != NULL)
-+ {
-+ gtk_widget_set_sensitive (widget, TRUE);
-+ }
-+ else
-+ gtk_widget_set_sensitive (widget, FALSE);
-
- /* hide device specific stuff */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
diff --git a/sources b/sources
index e0e5fd3..5ef1766 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-77e23ce7ab09489f78a40496df66446a mint-artwork-cinnamon_4.4.tar.gz
-e0749491c27ff3594008241c4759708a cinnamon-control-center-2.4.2.tar.gz
+b97bfd3376f088ecfeed82ca20d79ace cinnamon-control-center-2.5.0.git0febe4d.tar.gz
--
cgit v0.10.2
From 2510dc0a167ca1921dfbd9417266cd20f96993a6 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 18:47:16 +0100
Subject: bump c-s-d dep
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 989a11f..58ab3aa 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -1,7 +1,7 @@
%global _internal_version 0febe4d
%global _artwork_version 4.4
-%global csd_version 2.3.0
+%global csd_version 2.5.0
%global redhat_menus_version 1.8
%global gnome_menus_version 2.11.1
%global libXrandr_version 1.2.99
--
cgit v0.10.2
From c573992daba1b130aa8e6f102be5a027ee264571 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 19:28:52 +0100
Subject: fix sources
diff --git a/sources b/sources
index 5ef1766..22df81a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
b97bfd3376f088ecfeed82ca20d79ace cinnamon-control-center-2.5.0.git0febe4d.tar.gz
+77e23ce7ab09489f78a40496df66446a mint-artwork-cinnamon_4.4.tar.gz
--
cgit v0.10.2
From a528cb6edebf55a3c4b0011ff9cd632674da9791 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 20 May 2015 09:23:55 +0100
Subject: update to 2.6.0 release
diff --git a/.gitignore b/.gitignore
index 4a1c60e..fc6d2a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/cinnamon-control-center-2.4.1.tar.gz
/cinnamon-control-center-2.4.2.tar.gz
/cinnamon-control-center-2.5.0.git0febe4d.tar.gz
+/cinnamon-control-center-2.6.0.tar.gz
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 58ab3aa..62d57b6 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -1,15 +1,15 @@
-%global _internal_version 0febe4d
+#global _internal_version 0febe4d
%global _artwork_version 4.4
-%global csd_version 2.5.0
+%global csd_version 2.6.0
%global redhat_menus_version 1.8
%global gnome_menus_version 2.11.1
%global libXrandr_version 1.2.99
Summary: Utilities to configure the Cinnamon desktop
Name: cinnamon-control-center
-Version: 2.5.0
-Release: 0.1.git%{_internal_version}%{?dist}
+Version: 2.6.0
+Release: 1
# The following files contain code from
# ISC for panels/network/rfkill.h
# And MIT for wacom/calibrator/calibrator.c
@@ -23,8 +23,8 @@ URL: http://cinnamon.linuxmint.com
# wget https://github.com/linuxmint/cinnamon-control-center/archive/%%{version}.tar.gz -O cinnamon-control-center-%%{version}.tar.gz
# for git
# wget https://github.com/linuxmint/cinnamon-control-center/tarball/%%{_internal_version} -O cinnamon-control-center-%%{version}.git%%{_internal_version}.tar.gz
-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
+#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
Requires: cinnamon-settings-daemon >= %{csd_version}
@@ -51,7 +51,7 @@ Requires: glx-utils
Requires: gnome-color-manager
BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(cinnamon-desktop) >= 2.3.0
+BuildRequires: pkgconfig(cinnamon-desktop) >= 2.6.0
BuildRequires: pkgconfig(libgnome-menu-3.0) >= %{gnome_menus_version}
BuildRequires: cinnamon-menus-devel
BuildRequires: pkgconfig(cinnamon-settings-daemon) >= %{csd_version}
@@ -114,7 +114,7 @@ utilities for testing Metacity/Muffin themes.
%prep
-%setup -q -n linuxmint-%{name}-%{_internal_version}
+%setup -q
tar -xf %{SOURCE1}
NOCONFIGURE=1 ./autogen.sh
@@ -207,6 +207,9 @@ fi
%{_libdir}/pkgconfig/libcinnamon-control-center.pc
%changelog
+* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-1
+- update to 2.6.0 release
+
* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.1.git0febe4d
- update to git snapshot
diff --git a/sources b/sources
index 22df81a..8a16ce2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b97bfd3376f088ecfeed82ca20d79ace cinnamon-control-center-2.5.0.git0febe4d.tar.gz
77e23ce7ab09489f78a40496df66446a mint-artwork-cinnamon_4.4.tar.gz
+68ed80bce000864c80c63df207527aa9 cinnamon-control-center-2.6.0.tar.gz
--
cgit v0.10.2
From a27d3e73af58cba08d088dba58a8695d93d0587d Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 20 May 2015 12:05:21 +0100
Subject: re-add dist tag
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 62d57b6..f27e832 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: 1
+Release: 2%{?dist}
# The following files contain code from
# ISC for panels/network/rfkill.h
# And MIT for wacom/calibrator/calibrator.c
@@ -207,6 +207,9 @@ fi
%{_libdir}/pkgconfig/libcinnamon-control-center.pc
%changelog
+* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-2
+- re-add dist tag
+
* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-1
- update to 2.6.0 release
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cinnamon-control-center.git/commit/?h=f21&id=41563f1a277357f2cc47d38a494d6dd96fb1e4d4
More information about the scm-commits
mailing list