raveit65 pushed to mate-screensaver (master). "update to 1.10.1 release"

[notifications at fedoraproject.org]

From 5f8929b6eb46421f535998b5b0eb745e75bc8074 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Fri, 12 Jun 2015 14:47:37 +0200
Subject: update to 1.10.1 release


diff --git a/.gitignore b/.gitignore
index a0b71b0..9976b22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /mate-screensaver-1.9.2.tar.xz
 /mate-screensaver-1.9.90.tar.xz
 /mate-screensaver-1.10.0.tar.xz
+/mate-screensaver-1.10.1.tar.xz
diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index b58b0ef..018ec8c 100644
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -13,9 +13,12 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-screensaver
-Version:        %{branch}.0
+Version:        %{branch}.1
+%if 0%{?rel_build}
 Release:        1%{?dist}
-#Release:        0.1%{?git_rel}%{?dist}
+%else
+Release:        0.1%{?git_rel}%{?dist}
+%endif
 Summary:        MATE Screensaver
 License:        GPLv2+ and LGPLv2+
 URL:            http://pub.mate-desktop.org
@@ -26,10 +29,6 @@ URL:            http://pub.mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1194518
-# https://github.com/mate-desktop/mate-screensaver/pull/70
-Patch0:         mate-screensaver_check-for-running-dm-for-user-switch.patch
-
 Requires:       redhat-menus
 Requires:       system-logos
 Requires:       gnome-keyring-pam
@@ -70,10 +69,14 @@ Development files for mate-screensaver
 
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
-%patch0 -p1 -b .user-switch
 
-# needed for git snapshots
+%if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
+%else # 0%{?rel_build}
+# for snapshots
+# needed for git snapshots
+NOCONFIGURE=1 ./autogen.sh
+%endif # 0%{?rel_build}
 
 %build
 %configure                          \
@@ -147,6 +150,10 @@ fi
 
 
 %changelog
+* Fri Jun 12 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.10.1.1
+- update to 1.10.1 release
+- removed upstreamed patches
+
 * Tue May 05 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.10.0-1
 - update to 1.10.0-1 release
 
diff --git a/mate-screensaver_check-for-running-dm-for-user-switch.patch b/mate-screensaver_check-for-running-dm-for-user-switch.patch
deleted file mode 100644
index 3f26683..0000000
--- a/mate-screensaver_check-for-running-dm-for-user-switch.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
-index 91fac54..34aa87a 100644
---- a/src/gs-lock-plug.c
-+++ b/src/gs-lock-plug.c
-@@ -188,18 +188,20 @@ gs_lock_plug_style_set (GtkWidget *widget,
- }
- 
- static gboolean
--is_program_in_path (const char *program)
-+process_is_running (const char * name)
- {
--	char *tmp = g_find_program_in_path (program);
--	if (tmp != NULL)
--	{
--		g_free (tmp);
--		return TRUE;
--	}
--	else
--	{
--		return FALSE;
--	}
-+        int num_processes;
-+        gchar *command = g_strdup_printf ("pidof %s | wc -l", name);
-+        FILE *fp = popen(command, "r");
-+        fscanf(fp, "%d", &num_processes);
-+        pclose(fp);
-+        g_free (command);
-+
-+        if (num_processes > 0) {
-+                return TRUE;
-+        } else {
-+                return FALSE;
-+        }
- }
- 
- static void
-@@ -209,7 +211,7 @@ do_user_switch (GSLockPlug *plug)
- 	gboolean res;
- 	char    *command;
- 
--	if (is_program_in_path (MDM_FLEXISERVER_COMMAND))
-+	if (process_is_running ("mdm"))
- 	{
- 		/* MDM */
- 		command = g_strdup_printf ("%s %s",
-@@ -229,7 +231,7 @@ do_user_switch (GSLockPlug *plug)
- 			g_error_free (error);
- 		}
- 	}
--	else if (is_program_in_path (GDM_FLEXISERVER_COMMAND))
-+	else if (process_is_running ("gdm") || process_is_running("gdm3"))
- 	{
- 		/* GDM */
- 		command = g_strdup_printf ("%s %s",
-@@ -1284,12 +1286,12 @@ gs_lock_plug_set_switch_enabled (GSLockPlug *plug,
- 
- 	if (switch_enabled)
- 	{
--		if (is_program_in_path (MDM_FLEXISERVER_COMMAND))
-+		if (process_is_running ("mdm"))
- 		{
- 			/* MDM  */
- 			gtk_widget_show (plug->priv->auth_switch_button);
- 		}
--		else if (is_program_in_path (GDM_FLEXISERVER_COMMAND))
-+		else if (process_is_running ("gdm") || process_is_running("gdm3"))
- 		{
- 			/* GDM */
- 			gtk_widget_show (plug->priv->auth_switch_button);
-
diff --git a/sources b/sources
index 6b4de34..df280ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a56f9d1a9af15258f6db43bb1290c67  mate-screensaver-1.10.0.tar.xz
+c27412983d479836df913d573695e5f8  mate-screensaver-1.10.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-screensaver.git/commit/?h=master&id=5f8929b6eb46421f535998b5b0eb745e75bc8074