rdieter pushed to lightdm-gtk (master). "Merge branch 'master' into epel7"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 19:34:52 UTC 2015
>From 3c4da18fa7456d731ab7c48666092bc152ed4315 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 27 Jan 2014 06:55:14 -0600
Subject: CVE-2014-0979 (#149420,1049422)
diff --git a/lightdm-gtk-greeter-CVE-2014-0979.patch b/lightdm-gtk-greeter-CVE-2014-0979.patch
new file mode 100644
index 0000000..cd3b30a
--- /dev/null
+++ b/lightdm-gtk-greeter-CVE-2014-0979.patch
@@ -0,0 +1,19 @@
+diff -up lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.CVE-2014-0979 lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.CVE-2014-0979 2014-01-27 06:48:27.728865072 -0600
++++ lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c 2014-01-27 06:52:06.245342260 -0600
+@@ -603,13 +603,13 @@ start_authentication (const gchar *usern
+ }
+ g_free (data);
+
+- if (strcmp (username, "*other") == 0)
++ if (g_strcmp0 (username, "*other") == 0)
+ {
+ gtk_widget_show (GTK_WIDGET (username_entry));
+ gtk_widget_show (GTK_WIDGET (cancel_button));
+ lightdm_greeter_authenticate (greeter, NULL);
+ }
+- else if (strcmp (username, "*guest") == 0)
++ else if (g_strcmp0 (username, "*guest") == 0)
+ {
+ lightdm_greeter_authenticate_as_guest (greeter);
+ }
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 55f9140..558c80e 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -21,6 +21,12 @@ Patch50: lightdm-gtk-greeter-1.5.2-bg_crash.patch
# http://bugzilla.redhat.com/1002782
Patch51: lightdm-gtk-greeter-validate_session.patch
+
+## upstream patches
+# http://bugzilla.redhat.com/1049420
+# reportedly committed/fixed in 1.7+
+Patch200: lightdm-gtk-greeter-CVE-2014-0979.patch
+
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: pkgconfig(liblightdm-gobject-1)
@@ -52,6 +58,7 @@ A LightDM greeter that uses the GTK+ toolkit.
%patch1 -p1 -b .fedora
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .validate_session
+%patch200 -p1 -b .CVE-2014-0979
%build
@@ -95,6 +102,9 @@ fi
%changelog
+* Mon Jan 27 2014 Rex Dieter <rdieter at fedoraproject.org> 1.6.1-3
+- CVE-2014-0979 (#149420,1049422)
+
* Tue Oct 08 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.1-2
- lightdm-gtk-greeter segfaults if session last used is uninstalled (#1002782)
--
cgit v0.10.2
>From 67031aeeec84d9aa7a680460a7ee845c7038e5b1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 20 Feb 2014 07:53:13 -0600
Subject: 1.8.1
diff --git a/.gitignore b/.gitignore
index ec6a2f6..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-/lightdm-gtk-greeter-1.6.1.tar.gz
diff --git a/lightdm-gtk-greeter-1.5.2-fedora.patch b/lightdm-gtk-greeter-1.5.2-fedora.patch
deleted file mode 100644
index 26098e9..0000000
--- a/lightdm-gtk-greeter-1.5.2-fedora.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up lightdm-gtk-greeter-1.5.2/data/lightdm-gtk-greeter.conf.fedora lightdm-gtk-greeter-1.5.2/data/lightdm-gtk-greeter.conf
---- lightdm-gtk-greeter-1.5.2/data/lightdm-gtk-greeter.conf.fedora 2013-05-13 17:31:32.000000000 -0500
-+++ lightdm-gtk-greeter-1.5.2/data/lightdm-gtk-greeter.conf 2013-05-14 07:40:33.300698120 -0500
-@@ -14,7 +14,7 @@
- # keyboard = command to launch on-screen keyboard
- #
- [greeter]
--#background=
-+background=/usr/share/backgrounds/default.png
- #theme-name=
- #icon-theme-name=
- #font-name=
diff --git a/lightdm-gtk-greeter-1.8.1-fedora.patch b/lightdm-gtk-greeter-1.8.1-fedora.patch
new file mode 100644
index 0000000..430123f
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.1-fedora.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf.fedora lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf
+--- lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf.fedora 2014-02-20 06:49:39.444554362 -0600
++++ lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf 2014-02-20 06:50:30.212012176 -0600
+@@ -16,7 +16,7 @@
+ # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
+ #
+ [greeter]
+-#background=
++background=/usr/share/backgrounds/default.png
+ #theme-name=
+ #icon-theme-name=
+ #font-name=
diff --git a/lightdm-gtk-greeter-CVE-2014-0979.patch b/lightdm-gtk-greeter-CVE-2014-0979.patch
deleted file mode 100644
index cd3b30a..0000000
--- a/lightdm-gtk-greeter-CVE-2014-0979.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.CVE-2014-0979 lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.CVE-2014-0979 2014-01-27 06:48:27.728865072 -0600
-+++ lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c 2014-01-27 06:52:06.245342260 -0600
-@@ -603,13 +603,13 @@ start_authentication (const gchar *usern
- }
- g_free (data);
-
-- if (strcmp (username, "*other") == 0)
-+ if (g_strcmp0 (username, "*other") == 0)
- {
- gtk_widget_show (GTK_WIDGET (username_entry));
- gtk_widget_show (GTK_WIDGET (cancel_button));
- lightdm_greeter_authenticate (greeter, NULL);
- }
-- else if (strcmp (username, "*guest") == 0)
-+ else if (g_strcmp0 (username, "*guest") == 0)
- {
- lightdm_greeter_authenticate_as_guest (greeter);
- }
diff --git a/lightdm-gtk-greeter-validate_session.patch b/lightdm-gtk-greeter-validate_session.patch
index 187db1f..294b95e 100644
--- a/lightdm-gtk-greeter-validate_session.patch
+++ b/lightdm-gtk-greeter-validate_session.patch
@@ -1,15 +1,15 @@
-diff -up lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.foo lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c.foo 2013-10-08 15:25:58.582009118 -0500
-+++ lightdm-gtk-greeter-1.6.1/src/lightdm-gtk-greeter.c 2013-10-08 15:25:58.585009064 -0500
-@@ -290,6 +290,7 @@ set_session (const gchar *session)
+diff -up lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c.validate_session lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c.validate_session 2014-02-20 06:50:56.371732796 -0600
++++ lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c 2014-02-20 06:53:41.145973044 -0600
+@@ -528,6 +528,7 @@ set_session (const gchar *session)
const gchar *default_session;
gchar *last_session;
GList *menu_items, *menu_iter;
+ GList *items, *item;
-
- menu_items = gtk_container_get_children(GTK_CONTAINER(session_menu));
-
-@@ -314,9 +315,26 @@ set_session (const gchar *session)
+ #if GTK_CHECK_VERSION (3, 0, 0)
+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+ #endif
+@@ -569,9 +570,26 @@ set_session (const gchar *session)
last_session = g_key_file_get_value (state, "greeter", "last-session", NULL);
if (last_session && g_strcmp0 (session, last_session) != 0)
{
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 558c80e..dee8b4d 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,15 +3,15 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
-Version: 1.6.1
-Release: 3%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
-Source0: https://launchpad.net/lightdm-gtk-greeter/1.6/%{version}/+download/lightdm-gtk-greeter-%{version}.tar.gz
+Source0: https://launchpad.net/lightdm-gtk-greeter/1.8/%{version}/+download/lightdm-gtk-greeter-%{version}.tar.gz
# tweak default config
-Patch1: lightdm-gtk-greeter-1.5.2-fedora.patch
+Patch1: lightdm-gtk-greeter-1.8.1-fedora.patch
## upstreamable patches
# avoid setting background when given bogus screen geometry
@@ -23,9 +23,6 @@ Patch51: lightdm-gtk-greeter-validate_session.patch
## upstream patches
-# http://bugzilla.redhat.com/1049420
-# reportedly committed/fixed in 1.7+
-Patch200: lightdm-gtk-greeter-CVE-2014-0979.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -58,7 +55,6 @@ A LightDM greeter that uses the GTK+ toolkit.
%patch1 -p1 -b .fedora
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .validate_session
-%patch200 -p1 -b .CVE-2014-0979
%build
@@ -79,6 +75,7 @@ touch %{buildroot}%{_datadir}/xgreeters/lightdm-greeter.desktop
%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
%{_sbindir}/update-alternatives \
--install %{_datadir}/xgreeters/lightdm-greeter.desktop \
lightdm-greeter \
@@ -87,11 +84,17 @@ touch %{buildroot}%{_datadir}/xgreeters/lightdm-greeter.desktop
%postun
if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_sbindir}/update-alternatives \
--remove lightdm-greeter \
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
%files -f lightdm-gtk-greeter.lang
%doc ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
@@ -99,9 +102,13 @@ fi
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
# own alternatives target
%ghost %{_datadir}/xgreeters/lightdm-greeter.desktop
+%{_datadir}/icons/hicolor/scalable/places/*badge-symbolic.svg
%changelog
+* Thu Feb 20 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.1-1
+- 1.8.1
+
* Mon Jan 27 2014 Rex Dieter <rdieter at fedoraproject.org> 1.6.1-3
- CVE-2014-0979 (#149420,1049422)
diff --git a/sources b/sources
index d339bd2..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-a51619d8f85534c22c6d13c8f970fa81 lightdm-gtk-greeter-1.6.1.tar.gz
--
cgit v0.10.2
--
cgit v0.10.2
>From 09b73f3a1fd3a842903563528358c55a55d74f5c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 20 Feb 2014 13:52:01 -0600
Subject: new-sources, for real, with feeling
diff --git a/.gitignore b/.gitignore
index e69de29..8c35a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/lightdm-gtk-greeter-1.8.1.tar.gz
diff --git a/sources b/sources
index e69de29..a52f5e6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+40a1c7305cf2281e3f49d5ce5d82b649 lightdm-gtk-greeter-1.8.1.tar.gz
--
cgit v0.10.2
>From cd72a41eb24d60712c1a6b55cb0cb1e8655cec63 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 4 Mar 2014 10:21:04 -0600
Subject: 1.8.2 (#1047209)
diff --git a/.gitignore b/.gitignore
index 8c35a78..d65a855 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-gtk-greeter-1.8.1.tar.gz
+/lightdm-gtk-greeter-1.8.2.tar.gz
diff --git a/lightdm-gtk-greeter-1.5.2-bg_crash.patch b/lightdm-gtk-greeter-1.5.2-bg_crash.patch
deleted file mode 100644
index efe4090..0000000
--- a/lightdm-gtk-greeter-1.5.2-bg_crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up lightdm-gtk-greeter-1.5.2/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.5.2/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.5.2/src/lightdm-gtk-greeter.c.bg_crash 2013-05-13 17:31:32.000000000 -0500
-+++ lightdm-gtk-greeter-1.5.2/src/lightdm-gtk-greeter.c 2013-05-14 07:42:44.578305552 -0500
-@@ -1353,7 +1353,7 @@ set_background (GdkPixbuf *new_bg)
- {
- gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
-
-- if (bg)
-+ if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
- {
- p_width = gdk_pixbuf_get_width(bg);
- p_height = gdk_pixbuf_get_height(bg);
diff --git a/lightdm-gtk-greeter-1.8.2-bg_crash.patch b/lightdm-gtk-greeter-1.8.2-bg_crash.patch
new file mode 100644
index 0000000..d2bdd35
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.2-bg_crash.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash 2014-03-02 08:45:24.000000000 -0600
++++ lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c 2014-03-04 10:19:37.933758554 -0600
+@@ -2088,7 +2088,7 @@ set_background (GdkPixbuf *new_bg)
+ {
+ gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+
+- if (bg)
++ if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
+ {
+ p_width = gdk_pixbuf_get_width(bg);
+ p_height = gdk_pixbuf_get_height(bg);
diff --git a/lightdm-gtk-greeter-validate_session.patch b/lightdm-gtk-greeter-validate_session.patch
deleted file mode 100644
index 294b95e..0000000
--- a/lightdm-gtk-greeter-validate_session.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -up lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c.validate_session lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c.validate_session 2014-02-20 06:50:56.371732796 -0600
-+++ lightdm-gtk-greeter-1.8.1/src/lightdm-gtk-greeter.c 2014-02-20 06:53:41.145973044 -0600
-@@ -528,6 +528,7 @@ set_session (const gchar *session)
- const gchar *default_session;
- gchar *last_session;
- GList *menu_items, *menu_iter;
-+ GList *items, *item;
- #if GTK_CHECK_VERSION (3, 0, 0)
- GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
- #endif
-@@ -569,9 +570,26 @@ set_session (const gchar *session)
- last_session = g_key_file_get_value (state, "greeter", "last-session", NULL);
- if (last_session && g_strcmp0 (session, last_session) != 0)
- {
-- set_session (last_session);
-- g_free (last_session);
-- return;
-+ /* Go thru all sessions and compare them to our last_session otherwise we can get a segfault
-+ * if last_session is set to a non-existing or removed session
-+ */
-+ items = lightdm_get_sessions ();
-+ for (item = items; item; item = item->next)
-+ {
-+ LightDMSession *session = item->data;
-+ gchar *s;
-+ gboolean matched;
-+ s = lightdm_session_get_key (session);
-+ matched = strcmp (s, last_session) == 0;
-+ s = NULL;
-+ g_free(s);
-+ if (matched)
-+ {
-+ set_session (last_session);
-+ g_free (last_session);
-+ return;
-+ }
-+ }
- }
- g_free (last_session);
-
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index dee8b4d..c192bf7 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,7 +3,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
License: GPLv3+
@@ -16,10 +16,7 @@ Patch1: lightdm-gtk-greeter-1.8.1-fedora.patch
## upstreamable patches
# avoid setting background when given bogus screen geometry
# http://bugzilla.redhat.com/915986
-Patch50: lightdm-gtk-greeter-1.5.2-bg_crash.patch
-# lightdm-gtk-greeter segfaults if session last used is uninstalled (and has a silly cache location)
-# http://bugzilla.redhat.com/1002782
-Patch51: lightdm-gtk-greeter-validate_session.patch
+Patch50: lightdm-gtk-greeter-1.8.2-bg_crash.patch
## upstream patches
@@ -54,7 +51,6 @@ A LightDM greeter that uses the GTK+ toolkit.
%patch1 -p1 -b .fedora
%patch50 -p1 -b .bg_crash
-%patch51 -p1 -b .validate_session
%build
@@ -106,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Tue Mar 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.2-1
+- 1.8.2 (#1047209)
+
* Thu Feb 20 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.1-1
- 1.8.1
diff --git a/sources b/sources
index a52f5e6..c863b9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40a1c7305cf2281e3f49d5ce5d82b649 lightdm-gtk-greeter-1.8.1.tar.gz
+5fce1dc5a691fe8a12a6e7af3152220f lightdm-gtk-greeter-1.8.2.tar.gz
--
cgit v0.10.2
>From 6a5605ec3854ad924b77abf8775a47cee8c3ff9f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 31 Mar 2014 12:45:54 -0500
Subject: 1.8.4 (#1076529)
diff --git a/.gitignore b/.gitignore
index d65a855..57a3308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-gtk-greeter-1.8.2.tar.gz
+/lightdm-gtk-greeter-1.8.4.tar.gz
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index c192bf7..a7da896 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,7 +3,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
-Version: 1.8.2
+Version: 1.8.4
Release: 1%{?dist}
License: GPLv3+
@@ -102,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Mon Mar 31 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.4-1
+- 1.8.4 (#1076529)
+
* Tue Mar 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.2-1
- 1.8.2 (#1047209)
diff --git a/sources b/sources
index c863b9f..beda0f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fce1dc5a691fe8a12a6e7af3152220f lightdm-gtk-greeter-1.8.2.tar.gz
+42d32b6504addcc7cd74058e901dbcc5 lightdm-gtk-greeter-1.8.4.tar.gz
--
cgit v0.10.2
>From e5f8eef1aa0a9d38a0202e31a8da952f8cbaa1b8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 1 Apr 2014 11:52:29 -0500
Subject: fix build, unpackaged files
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index a7da896..ffe3d24 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -69,6 +69,9 @@ make install DESTDIR=%{buildroot}
# own alternatives target
touch %{buildroot}%{_datadir}/xgreeters/lightdm-greeter.desktop
+## unpackaged files
+rm -fv %{buildroot}%{_docdir}/lightdm-gtk-greeter/sample-lightdm-gtk-greeter.css
+
%post
touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
@@ -93,6 +96,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files -f lightdm-gtk-greeter.lang
%doc ChangeLog COPYING NEWS README
+%doc data/sample-lightdm-gtk-greeter.css
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
%{_sbindir}/lightdm-gtk-greeter
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
--
cgit v0.10.2
>From 3b0c7bbe488c853ad3372293a68aab48f973d5b1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 5 May 2014 13:43:27 -0500
Subject: 1.8.5 (#1094437)
diff --git a/.gitignore b/.gitignore
index 57a3308..4fb7c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-gtk-greeter-1.8.4.tar.gz
+/lightdm-gtk-greeter-1.8.5.tar.gz
diff --git a/lightdm-gtk-greeter-1.8.2-bg_crash.patch b/lightdm-gtk-greeter-1.8.2-bg_crash.patch
deleted file mode 100644
index d2bdd35..0000000
--- a/lightdm-gtk-greeter-1.8.2-bg_crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c.bg_crash 2014-03-02 08:45:24.000000000 -0600
-+++ lightdm-gtk-greeter-1.8.2/src/lightdm-gtk-greeter.c 2014-03-04 10:19:37.933758554 -0600
-@@ -2088,7 +2088,7 @@ set_background (GdkPixbuf *new_bg)
- {
- gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
-
-- if (bg)
-+ if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
- {
- p_width = gdk_pixbuf_get_width(bg);
- p_height = gdk_pixbuf_get_height(bg);
diff --git a/lightdm-gtk-greeter-1.8.5-bg_crash.patch b/lightdm-gtk-greeter-1.8.5-bg_crash.patch
new file mode 100644
index 0000000..1941edd
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.5-bg_crash.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.bg_crash 2014-05-05 13:39:10.833190035 -0500
++++ lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c 2014-05-05 13:41:53.725481558 -0500
+@@ -2060,7 +2060,7 @@ set_background (GdkPixbuf *new_bg)
+ {
+ gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+
+- if (bg)
++ if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
+ {
+ p_width = gdk_pixbuf_get_width (bg);
+ p_height = gdk_pixbuf_get_height (bg);
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index ffe3d24..190eb82 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -3,7 +3,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
-Version: 1.8.4
+Version: 1.8.5
Release: 1%{?dist}
License: GPLv3+
@@ -16,7 +16,7 @@ Patch1: lightdm-gtk-greeter-1.8.1-fedora.patch
## upstreamable patches
# avoid setting background when given bogus screen geometry
# http://bugzilla.redhat.com/915986
-Patch50: lightdm-gtk-greeter-1.8.2-bg_crash.patch
+Patch50: lightdm-gtk-greeter-1.8.5-bg_crash.patch
## upstream patches
@@ -106,6 +106,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Mon May 05 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-1
+- 1.8.5 (#1094437)
+
* Mon Mar 31 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.4-1
- 1.8.4 (#1076529)
diff --git a/sources b/sources
index beda0f1..5214f92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42d32b6504addcc7cd74058e901dbcc5 lightdm-gtk-greeter-1.8.4.tar.gz
+ce1384d6738a5757d26091792f29f1e1 lightdm-gtk-greeter-1.8.5.tar.gz
--
cgit v0.10.2
>From f989c1e1178955b7401cd8dd573039518e687858 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 7 Jun 2014 01:22:55 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 190eb82..2b030f5 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -106,6 +106,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Mon May 05 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-1
- 1.8.5 (#1094437)
--
cgit v0.10.2
>From c528fdf9888cc89729c260ccf3ea5b8d6f66a07b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 11 Aug 2014 11:40:36 -0500
Subject: missing icons, +Requires: gnome-icon-theme (#1128697)
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 2b030f5..e51fb0e 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -34,6 +34,9 @@ Provides: lightdm-greeter = 1.2
Requires: lightdm%{?_isa}
# for /usr/share/backgrounds/default.png
Requires: desktop-backgrounds-compat
+# standard icons, not yet provided by adwaita
+# https://bugzilla.redhat.com/1128697
+Requires: gnome-icon-theme
# owner of HighContrast gtk/icon themes
Requires: gnome-themes-standard
# for /usr/share/pixmaps/fedora-logo-small.png
@@ -106,6 +109,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Mon Aug 11 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-3
+- missing icons, +Requires: gnome-icon-theme (#1128697)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From 39491d964c88089acabb2889fc463ff0cfb05d8d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sun, 17 Aug 2014 07:11:50 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index e51fb0e..904aa4c 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK+ Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -109,6 +109,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Mon Aug 11 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-3
- missing icons, +Requires: gnome-icon-theme (#1128697)
--
cgit v0.10.2
>From 647509f60bc0f77c397bdc906e1e6ade3bd7d849 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Oct 2014 13:58:19 -0500
Subject: lightdm-gtk2, -common subpkgs
diff --git a/lightdm-gtk-greeter-1.8.5-vpath.patch b/lightdm-gtk-greeter-1.8.5-vpath.patch
new file mode 100644
index 0000000..3c38e55
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.5-vpath.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am.vpath lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am
+--- lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am.vpath 2014-05-04 07:02:00.000000000 -0500
++++ lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am 2014-10-04 10:07:51.856937574 -0500
+@@ -4,7 +4,7 @@ EXTRA_DIST = \
+ Datadir = $(datadir)/icons/hicolor/scalable/places
+
+ Data_DATA = \
+- $(wildcard *.svg)
++ $(wildcard $(srcdir)/*.svg)
+
+ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 904aa4c..f931c55 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -1,10 +1,10 @@
%global _hardened_build 1
-Summary: LightDM GTK+ Greeter
+Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -17,21 +17,34 @@ Patch1: lightdm-gtk-greeter-1.8.1-fedora.patch
# avoid setting background when given bogus screen geometry
# http://bugzilla.redhat.com/915986
Patch50: lightdm-gtk-greeter-1.8.5-bg_crash.patch
-
+# fix out-of-tree builds
+Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
## upstream patches
+BuildRequires: automake libtool
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: pkgconfig(liblightdm-gobject-1)
BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtk+-2.0)
Obsoletes: lightdm-gtk-greeter < 1.1.5-4
Provides: lightdm-gtk-greeter = %{version}-%{release}
-
Provides: lightdm-greeter = 1.2
-
+Requires: %{name}-common = %{version}-%{release}
Requires: lightdm%{?_isa}
+
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+
+%description
+A LightDM greeter that uses the GTK3 toolkit.
+
+%package common
+Summary: Common files for %{name}
+# when -common was split out
+Conflicts: lightdm-gtk < 1.8.5-5
# for /usr/share/backgrounds/default.png
Requires: desktop-backgrounds-compat
# standard icons, not yet provided by adwaita
@@ -41,31 +54,68 @@ Requires: gnome-icon-theme
Requires: gnome-themes-standard
# for /usr/share/pixmaps/fedora-logo-small.png
Requires: system-logos
+BuildArch: noarch
+%description common
+%{summary}.
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
-
-%description
-A LightDM greeter that uses the GTK+ toolkit.
+%package -n lightdm-gtk2
+Summary: LightDM GTK2 Greeter
+Provides: lightdm-greeter = 1.2
+Requires: %{name}-common = %{version}-%{release}
+Requires: lightdm%{?_isa}
+%description -n lightdm-gtk2
+A LightDM greeter that uses the GTK2 toolkit.
%prep
%setup -q -n lightdm-gtk-greeter-%{version}
-%patch1 -p1 -b .fedora
%patch50 -p1 -b .bg_crash
+%patch51 -p1 -b .vpath
+
+%patch1 -p1 -b .fedora
+
+# required by patch51
+autoreconf -f -i
%build
+%global _configure ../configure
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%configure \
+ --disable-silent-rules \
+ --disable-static
+
+make %{?_smp_mflags}
+popd
+
+# gtk2 build
+mkdir %{_target_platform}-gtk2
+pushd %{_target_platform}-gtk2
%configure \
--disable-silent-rules \
--disable-static \
+ --with-gtk2
make %{?_smp_mflags}
+popd
%install
-make install DESTDIR=%{buildroot}
+# GTK2
+make install DESTDIR=%{buildroot} -C %{_target_platform}-gtk2
+mv %{buildroot}%{_sbindir}/lightdm-gtk-greeter \
+ %{buildroot}%{_sbindir}/lightdm-gtk2-greeter
+mv %{buildroot}%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop \
+ %{buildroot}%{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
+sed -i \
+ -e 's|^Exec=lightdm-gtk-greeter|Exec=lightdm-gtk2-greeter|' \
+ -e 's|GTK+|GTK2|g' \
+ %{buildroot}%{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
+
+# GTK3
+make install DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang lightdm-gtk-greeter
@@ -77,7 +127,6 @@ rm -fv %{buildroot}%{_docdir}/lightdm-gtk-greeter/sample-lightdm-gtk-greeter.css
%post
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
%{_sbindir}/update-alternatives \
--install %{_datadir}/xgreeters/lightdm-greeter.desktop \
lightdm-greeter \
@@ -86,18 +135,12 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
%postun
if [ $1 -eq 0 ]; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_sbindir}/update-alternatives \
--remove lightdm-greeter \
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
fi
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-
-%files -f lightdm-gtk-greeter.lang
+%files
%doc ChangeLog COPYING NEWS README
%doc data/sample-lightdm-gtk-greeter.css
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
@@ -105,10 +148,33 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
# own alternatives target
%ghost %{_datadir}/xgreeters/lightdm-greeter.desktop
+
+%post common
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+
+%postun common
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+%files common -f lightdm-gtk-greeter.lang
%{_datadir}/icons/hicolor/scalable/places/*badge-symbolic.svg
+%files -n lightdm-gtk2 -f lightdm-gtk-greeter.lang
+%doc ChangeLog COPYING NEWS README
+%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
+%{_sbindir}/lightdm-gtk2-greeter
+%{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
+
%changelog
+* Sat Oct 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-5
+- lightdm-gtk2, -common subpkgs
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
>From 74c18c94a0ac495f0e0f961c09dd27a920aa3ae3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Oct 2014 16:27:33 -0500
Subject: try to avoid (re)autoconf with vpath.patch
diff --git a/lightdm-gtk-greeter-1.8.5-vpath.patch b/lightdm-gtk-greeter-1.8.5-vpath.patch
index 3c38e55..87182b3 100644
--- a/lightdm-gtk-greeter-1.8.5-vpath.patch
+++ b/lightdm-gtk-greeter-1.8.5-vpath.patch
@@ -1,6 +1,6 @@
diff -up lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am.vpath lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am
--- lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am.vpath 2014-05-04 07:02:00.000000000 -0500
-+++ lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am 2014-10-04 10:07:51.856937574 -0500
++++ lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am 2014-10-04 16:25:47.551608841 -0500
@@ -4,7 +4,7 @@ EXTRA_DIST = \
Datadir = $(datadir)/icons/hicolor/scalable/places
@@ -10,3 +10,15 @@ diff -up lightdm-gtk-greeter-1.8.5/data/badges/Makefile.am.vpath lightdm-gtk-gre
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+diff -up lightdm-gtk-greeter-1.8.5/data/badges/Makefile.in.vpath lightdm-gtk-greeter-1.8.5/data/badges/Makefile.in
+--- lightdm-gtk-greeter-1.8.5/data/badges/Makefile.in.vpath 2014-05-04 07:02:37.000000000 -0500
++++ lightdm-gtk-greeter-1.8.5/data/badges/Makefile.in 2014-10-04 16:26:37.089207049 -0500
+@@ -305,7 +305,7 @@ EXTRA_DIST = \
+
+ Datadir = $(datadir)/icons/hicolor/scalable/places
+ Data_DATA = \
+- $(wildcard *.svg)
++ $(wildcard $(srcdir)/*.svg)
+
+ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+ all: all-am
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index f931c55..6e31e0b 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -22,7 +22,6 @@ Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
## upstream patches
-BuildRequires: automake libtool
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: pkgconfig(liblightdm-gobject-1)
@@ -75,9 +74,6 @@ A LightDM greeter that uses the GTK2 toolkit.
%patch1 -p1 -b .fedora
-# required by patch51
-autoreconf -f -i
-
%build
%global _configure ../configure
--
cgit v0.10.2
>From 370cd45372e38f43e91ffebf584b25be516c04e4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Oct 2014 17:47:37 -0500
Subject: lightdm-gtk2: support alternatives (for default lightdm greeter)
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 6e31e0b..945422d 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -62,6 +62,8 @@ Summary: LightDM GTK2 Greeter
Provides: lightdm-greeter = 1.2
Requires: %{name}-common = %{version}-%{release}
Requires: lightdm%{?_isa}
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
%description -n lightdm-gtk2
A LightDM greeter that uses the GTK2 toolkit.
@@ -160,6 +162,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files common -f lightdm-gtk-greeter.lang
%{_datadir}/icons/hicolor/scalable/places/*badge-symbolic.svg
+%post
+%{_sbindir}/update-alternatives \
+ --install %{_datadir}/xgreeters/lightdm-greeter.desktop \
+ lightdm-greeter \
+ %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop \
+ 15
+
+%postun
+if [ $1 -eq 0 ]; then
+%{_sbindir}/update-alternatives \
+ --remove lightdm-greeter \
+ %{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
+fi
+
%files -n lightdm-gtk2 -f lightdm-gtk-greeter.lang
%doc ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
@@ -168,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Sat Oct 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-6
+- lightdm-gtk2: support alternatives (for default lightdm greeter)
+
* Sat Oct 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-5
- lightdm-gtk2, -common subpkgs
--
cgit v0.10.2
>From 599826f4f91ea465449e7ff814c69120856c762d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Oct 2014 17:49:08 -0500
Subject: fix scriptlets
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 945422d..4f40f3f 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -162,14 +162,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files common -f lightdm-gtk-greeter.lang
%{_datadir}/icons/hicolor/scalable/places/*badge-symbolic.svg
-%post
+%post -n lightdm-gtk2
%{_sbindir}/update-alternatives \
--install %{_datadir}/xgreeters/lightdm-greeter.desktop \
lightdm-greeter \
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop \
15
-%postun
+%postun -n lightdm-gtk2
if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives \
--remove lightdm-greeter \
--
cgit v0.10.2
>From 8274b019e74367207c53ef0c000a0e72032f4cc5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 5 Oct 2014 13:35:23 -0500
Subject: 1.8.5-7
- -gtk2: fix alternatives, omit dup'd translations
- -common: fix %posttrans icon scriptlet
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 4f40f3f..cd98bd3 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -156,7 +156,7 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
-%posttrans
+%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files common -f lightdm-gtk-greeter.lang
@@ -166,7 +166,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_sbindir}/update-alternatives \
--install %{_datadir}/xgreeters/lightdm-greeter.desktop \
lightdm-greeter \
- %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop \
+ %{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop \
15
%postun -n lightdm-gtk2
@@ -176,7 +176,7 @@ if [ $1 -eq 0 ]; then
%{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
fi
-%files -n lightdm-gtk2 -f lightdm-gtk-greeter.lang
+%files -n lightdm-gtk2
%doc ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
%{_sbindir}/lightdm-gtk2-greeter
@@ -184,6 +184,10 @@ fi
%changelog
+* Sun Oct 05 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-7
+- -gtk2: fix alternatives, omit dup'd translations
+- -common: fix %%posttrans icon scriptlet
+
* Sat Oct 04 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-6
- lightdm-gtk2: support alternatives (for default lightdm greeter)
--
cgit v0.10.2
>From 3bb0bfbd9a9997d5936ef59ac17bef90983cba0b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 5 Oct 2014 14:39:44 -0500
Subject: 1.8.5-8
- create/own %{_datadir}/lightdm-gtk-greeter/
- -gtk2: own lightdm-greeter.desktop alternatives target
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index cd98bd3..fa514d5 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -117,6 +117,9 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang lightdm-gtk-greeter
+# create/own GREETER_DATA_DIR
+mkdir -p %{buildroot}%{_datadir}/lightdm-gtk-greeter/
+
# own alternatives target
touch %{buildroot}%{_datadir}/xgreeters/lightdm-greeter.desktop
@@ -144,6 +147,7 @@ fi
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
%{_sbindir}/lightdm-gtk-greeter
%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
+%dir %{_datadir}/lightdm-gtk-greeter/
# own alternatives target
%ghost %{_datadir}/xgreeters/lightdm-greeter.desktop
@@ -180,10 +184,18 @@ fi
%doc ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
%{_sbindir}/lightdm-gtk2-greeter
+%dir %{_datadir}/lightdm-gtk-greeter/
%{_datadir}/xgreeters/lightdm-gtk2-greeter.desktop
+# own alternatives target
+%ghost %{_datadir}/xgreeters/lightdm-greeter.desktop
%changelog
+* Sun Oct 05 2014 Rex Dieter <rdieter at fedoraproject.org>
+- 1.8.5-8
+- create/own %%{_datadir}/lightdm-gtk-greeter/
+- -gtk2: own lightdm-greeter.desktop alternatives target
+
* Sun Oct 05 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-7
- -gtk2: fix alternatives, omit dup'd translations
- -common: fix %%posttrans icon scriptlet
--
cgit v0.10.2
>From 3dc5989fd18f31406fa71d2f9d1d56336342525c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 6 Oct 2014 13:56:45 -0500
Subject: cursor theme doesn't change (#989152)
diff --git a/lightdm-gtk-greeter-1.8.5-lp#1024482.patch b/lightdm-gtk-greeter-1.8.5-lp#1024482.patch
new file mode 100644
index 0000000..57e6733
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.5-lp#1024482.patch
@@ -0,0 +1,13 @@
+diff -up lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.lp#1024482 lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c.lp#1024482 2014-10-06 13:52:51.869311249 -0500
++++ lightdm-gtk-greeter-1.8.5/src/lightdm-gtk-greeter.c 2014-10-06 13:54:15.032163963 -0500
+@@ -2267,6 +2267,9 @@ main (int argc, char **argv)
+ /* Disable global menus */
+ g_unsetenv ("UBUNTU_MENUPROXY");
+
++ /* LP: #1024482 */
++ g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);
++
+ /* Initialize i18n */
+ setlocale (LC_ALL, "");
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index fa514d5..a456a33 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -21,6 +21,9 @@ Patch50: lightdm-gtk-greeter-1.8.5-bg_crash.patch
Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
## upstream patches
+# backport fix for mouse cursor
+# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/298
+Patch100: lightdm-gtk-greeter-1.8.5-lp#1024482.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -71,6 +74,8 @@ A LightDM greeter that uses the GTK2 toolkit.
%prep
%setup -q -n lightdm-gtk-greeter-%{version}
+%patch100 -p1 -b .lp#1024482
+
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
@@ -191,8 +196,10 @@ fi
%changelog
-* Sun Oct 05 2014 Rex Dieter <rdieter at fedoraproject.org>
-- 1.8.5-8
+* Mon Oct 06 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-9
+- cursor theme doesn't change (#989152)
+
+* Sun Oct 05 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.8.5-8
- create/own %%{_datadir}/lightdm-gtk-greeter/
- -gtk2: own lightdm-greeter.desktop alternatives target
--
cgit v0.10.2
>From 562ccaf8a082d87f953395c3ab24847478a45a3a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Nov 2014 10:53:59 -0600
Subject: revert +Requires: gnome-icon-theme, adwaita reportedly good enough
now (#1128697)
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index a456a33..29538a1 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -49,9 +49,6 @@ Summary: Common files for %{name}
Conflicts: lightdm-gtk < 1.8.5-5
# for /usr/share/backgrounds/default.png
Requires: desktop-backgrounds-compat
-# standard icons, not yet provided by adwaita
-# https://bugzilla.redhat.com/1128697
-Requires: gnome-icon-theme
# owner of HighContrast gtk/icon themes
Requires: gnome-themes-standard
# for /usr/share/pixmaps/fedora-logo-small.png
@@ -196,6 +193,9 @@ fi
%changelog
+* Fri Nov 07 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-10
+- revert +Requires: gnome-icon-theme, adwaita reportedly good enough now (#1128697)
+
* Mon Oct 06 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-9
- cursor theme doesn't change (#989152)
--
cgit v0.10.2
>From 77ea073e28233c78fcafebdade1ad5ab552046a6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 31 Jan 2015 16:33:12 -0600
Subject: add badges for Mate and Window Maker (#1178498)
diff --git a/lightdm-gtk-greeter-1.9.1-badges.patch b/lightdm-gtk-greeter-1.9.1-badges.patch
new file mode 100644
index 0000000..e969624
--- /dev/null
+++ b/lightdm-gtk-greeter-1.9.1-badges.patch
@@ -0,0 +1,48 @@
+=== added file 'data/badges/mate_badge-symbolic.svg'
+--- data/badges/mate_badge-symbolic.svg 1970-01-01 00:00:00 +0000
++++ data/badges/mate_badge-symbolic.svg 2014-12-05 15:47:23 +0000
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
++ <metadata id="metadata7">
++ <rdf:RDF>
++ <cc:Work rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++ <dc:title/>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <g id="layer2" display="none" transform="translate(0,-6)">
++ <rect id="rect4898" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#333"/>
++ </g>
++ <g id="layer3" display="none" transform="translate(0,-6)">
++ <rect id="rect4126" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#efebe7"/>
++ </g>
++ <g id="layer1" transform="matrix(1.0319689,0,0,1.0563566,-0.69397664,-6.778957)" stroke-miterlimit="4" stroke-width="0" fill="#bebebe">
++ <path id="path5070" fill-rule="evenodd" d="m1.6415,10.204,6.7832,3.7866-6.7832,3.7866z"/>
++ <path id="path5067" d="m15.208,13.991c0-3.658-3.131-6.6271-6.7834-6.6271-2.109,0-4.1361,1.0094-5.348,2.5503l0.85177,0.47616c1.034-1.2658,2.7359-2.0798,4.4963-2.0798,3.1115-1E-7,5.8141,2.5683,5.8141,5.6799,0,3.1115-2.7025,5.6799-5.8141,5.6799-1.7553,0-3.5475-0.92376-4.5815-2.183l-0.84886,0.47427c1.2122,1.5345,3.3264,2.6554,5.4304,2.6554,3.6524,0,6.7832-2.9686,6.7832-6.6266z"/>
++ <path id="path5648" d="m12.301,13.99c0-2.2361-1.64-3.7866-3.8761-3.7866-1.1905,0-2.0368,0.32699-2.7782,1.1454l0.8789,0.49036c0.55229-0.54547,1.065-0.68916,1.8993-0.68916,1.6896,0,2.9071,1.1392,2.9071,2.84s-1.2175,2.84-2.9071,2.84c-0.84982,0-1.4491-0.21841-2.0039-0.78193l-0.86824,0.48468c0.74137,0.81851,1.6817,1.2439,2.8722,1.2439,2.2361,0,3.8761-1.5505,3.8761-3.7866z"/>
++ </g>
++</svg>
+
+=== added file 'data/badges/wmaker-common_badge-symbolic.svg'
+--- data/badges/wmaker-common_badge-symbolic.svg 1970-01-01 00:00:00 +0000
++++ data/badges/wmaker-common_badge-symbolic.svg 2014-12-05 15:47:23 +0000
+@@ -0,0 +1,14 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
++<svg id="svg888" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
++ <metadata id="metadata10">
++ <rdf:RDF>
++ <cc:Work rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++ <dc:title/>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <path id="path148" d="M8,1c-3.8429,0-7,3.157-7,7,0,1.77,0.9107,3.7715,2,5h3v-5h4v-5h3c-1.274-1.4009-2.959-2-5-2zm5,2c1.1245,1.2366,2,3.1982,2,5,0,3.8428-3.157,7-7,7-2.073,0-3.7242-0.56089-5-2h-2v2h14v-12h-2z" fill-rule="evenodd" stroke-width="1pt" fill="#bebebe"/>
++</svg>
+
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 29538a1..fa9752c 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -24,6 +24,9 @@ Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
# backport fix for mouse cursor
# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/298
Patch100: lightdm-gtk-greeter-1.8.5-lp#1024482.patch
+# add badges for Mate and Window Maker
+# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/311
+Patch101: lightdm-gtk-greeter-1.9.1-badges.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -72,6 +75,7 @@ A LightDM greeter that uses the GTK2 toolkit.
%setup -q -n lightdm-gtk-greeter-%{version}
%patch100 -p1 -b .lp#1024482
+%patch101 -p0 -b .badges
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
@@ -193,6 +197,9 @@ fi
%changelog
+* Sat Jan 31 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-11
+- add badges for Mate and Window Maker (#1178498)
+
* Fri Nov 07 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-10
- revert +Requires: gnome-icon-theme, adwaita reportedly good enough now (#1128697)
--
cgit v0.10.2
>From afbc21bad1a8851a475cbeae1839601d339a0906 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Tue, 17 Feb 2015 23:39:48 +0100
Subject: add cinnamon badge
diff --git a/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch b/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch
new file mode 100644
index 0000000..ad8c6b7
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch
@@ -0,0 +1,158 @@
+diff -uprN lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon2d_badge-symbolic.svg lightdm-gtk-greeter-1.8.5/data/badges/cinnamon2d_badge-symbolic.svg
+--- lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon2d_badge-symbolic.svg 1970-01-01 01:00:00.000000000 +0100
++++ lightdm-gtk-greeter-1.8.5/data/badges/cinnamon2d_badge-symbolic.svg 2015-02-01 17:53:38.897011000 +0100
+@@ -0,0 +1,75 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++ xmlns:dc="http://purl.org/dc/elements/1.1/"
++ xmlns:cc="http://creativecommons.org/ns#"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns="http://www.w3.org/2000/svg"
++ xmlns:xlink="http://www.w3.org/1999/xlink"
++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++ id="svg2"
++ version="1.1"
++ inkscape:version="0.48.5 r10040"
++ width="16"
++ height="16"
++ sodipodi:docname="cinnamon2d_badge-symbolic.png">
++ <metadata
++ id="metadata8">
++ <rdf:RDF>
++ <cc:Work
++ rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type
++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++ <dc:title></dc:title>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <defs
++ id="defs6" />
++ <sodipodi:namedview
++ pagecolor="#ffffff"
++ bordercolor="#666666"
++ borderopacity="1"
++ objecttolerance="10"
++ gridtolerance="10"
++ guidetolerance="10"
++ inkscape:pageopacity="0"
++ inkscape:pageshadow="2"
++ inkscape:window-width="640"
++ inkscape:window-height="483"
++ id="namedview4"
++ showgrid="false"
++ inkscape:zoom="14.75"
++ inkscape:cx="8"
++ inkscape:cy="7.8644068"
++ inkscape:window-x="276"
++ inkscape:window-y="177"
++ inkscape:window-maximized="0"
++ inkscape:current-layer="svg2" />
++ <image
++ width="16"
++ height="16"
++ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAcxJREFU
++OI2tk72qGlEUhb+jHp0RdUQQwYi2l2vEELAO8RHyDEmbFwghdV4njdg4lZVIYhoDEkgxghjxB39m
++RufOTqGG603kpsiCDQf2Wd/axd6q0+kIcK1CwOcoAX4APRH52Gw2vwNETk11ekeBGKCBOGAA1qmy
++wDPgjVLqs23brwDUaQIAotEolmWxWq24u7vjEa2VUrcRpdRLEXkLBKZpUq/XMU3zMTNAWkTeK5Hj
++ALZtD1Op1E2j0aDX67HZbDAMg0qlgtaa8XiMZVlks1kcx2E2mwF8jd0jrh5GVKtV0uk0YRiSz+cB
++CIKAWq12DrmNPDSdlUwmyWQyDIdD+v0+AI7j0O12ORwOFAoFgNhVgGEYALiui+u6AHieRxiG+L7/
++u38V8K/6r4DD/YbneTiOw36/R0RwHIf1en0dICLfzp9TqRS73Y7RaITneYgIo9GI5XJJJBIhkUgQ
++BAFwXFsAlFK9/X7/erFYUC6XcV0X3/cv0rTWlEoltNZMJpOj77xIrVYrYRjGl1wud1OtVonFYlzT
++fD5nMBhcAgA6nc5zpdQnrfWTYrH4B0RE2G63TKdTTr6fFwCAdrudi8fjH4AXwFOOF/o3TZVS734B
++6IDRhG8yhb8AAAAASUVORK5CYII=
++"
++ id="image10"
++ x="0"
++ y="0" />
++ <path
++ style="fill:#000000"
++ d=""
++ id="path2987"
++ inkscape:connector-curvature="0" />
++</svg>
+diff -uprN lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon_badge-symbolic.svg lightdm-gtk-greeter-1.8.5/data/badges/cinnamon_badge-symbolic.svg
+--- lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon_badge-symbolic.svg 1970-01-01 01:00:00.000000000 +0100
++++ lightdm-gtk-greeter-1.8.5/data/badges/cinnamon_badge-symbolic.svg 2015-02-01 17:53:38.897011000 +0100
+@@ -0,0 +1,75 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++ xmlns:dc="http://purl.org/dc/elements/1.1/"
++ xmlns:cc="http://creativecommons.org/ns#"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns="http://www.w3.org/2000/svg"
++ xmlns:xlink="http://www.w3.org/1999/xlink"
++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++ id="svg2"
++ version="1.1"
++ inkscape:version="0.48.5 r10040"
++ width="16"
++ height="16"
++ sodipodi:docname="cinnamon2d_badge-symbolic.png">
++ <metadata
++ id="metadata8">
++ <rdf:RDF>
++ <cc:Work
++ rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type
++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++ <dc:title></dc:title>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <defs
++ id="defs6" />
++ <sodipodi:namedview
++ pagecolor="#ffffff"
++ bordercolor="#666666"
++ borderopacity="1"
++ objecttolerance="10"
++ gridtolerance="10"
++ guidetolerance="10"
++ inkscape:pageopacity="0"
++ inkscape:pageshadow="2"
++ inkscape:window-width="640"
++ inkscape:window-height="483"
++ id="namedview4"
++ showgrid="false"
++ inkscape:zoom="14.75"
++ inkscape:cx="8"
++ inkscape:cy="7.8644068"
++ inkscape:window-x="276"
++ inkscape:window-y="177"
++ inkscape:window-maximized="0"
++ inkscape:current-layer="svg2" />
++ <image
++ width="16"
++ height="16"
++ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAcxJREFU
++OI2tk72qGlEUhb+jHp0RdUQQwYi2l2vEELAO8RHyDEmbFwghdV4njdg4lZVIYhoDEkgxghjxB39m
++RufOTqGG603kpsiCDQf2Wd/axd6q0+kIcK1CwOcoAX4APRH52Gw2vwNETk11ekeBGKCBOGAA1qmy
++wDPgjVLqs23brwDUaQIAotEolmWxWq24u7vjEa2VUrcRpdRLEXkLBKZpUq/XMU3zMTNAWkTeK5Hj
++ALZtD1Op1E2j0aDX67HZbDAMg0qlgtaa8XiMZVlks1kcx2E2mwF8jd0jrh5GVKtV0uk0YRiSz+cB
++CIKAWq12DrmNPDSdlUwmyWQyDIdD+v0+AI7j0O12ORwOFAoFgNhVgGEYALiui+u6AHieRxiG+L7/
++u38V8K/6r4DD/YbneTiOw36/R0RwHIf1en0dICLfzp9TqRS73Y7RaITneYgIo9GI5XJJJBIhkUgQ
++BAFwXFsAlFK9/X7/erFYUC6XcV0X3/cv0rTWlEoltNZMJpOj77xIrVYrYRjGl1wud1OtVonFYlzT
++fD5nMBhcAgA6nc5zpdQnrfWTYrH4B0RE2G63TKdTTr6fFwCAdrudi8fjH4AXwFOOF/o3TZVS734B
++6IDRhG8yhb8AAAAASUVORK5CYII=
++"
++ id="image10"
++ x="0"
++ y="0" />
++ <path
++ style="fill:#000000"
++ d=""
++ id="path2987"
++ inkscape:connector-curvature="0" />
++</svg>
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index fa9752c..b63a5bc 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -23,10 +23,12 @@ Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
## upstream patches
# backport fix for mouse cursor
# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/298
-Patch100: lightdm-gtk-greeter-1.8.5-lp#1024482.patch
+Patch100: lightdm-gtk-greeter-1.8.5-lp#1024482.patch
# add badges for Mate and Window Maker
# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/311
-Patch101: lightdm-gtk-greeter-1.9.1-badges.patch
+Patch101: lightdm-gtk-greeter-1.9.1-badges.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1178498
+Patch102: lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -76,6 +78,7 @@ A LightDM greeter that uses the GTK2 toolkit.
%patch100 -p1 -b .lp#1024482
%patch101 -p0 -b .badges
+%patch102 -p0 -b .cinnamon-badges
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
@@ -197,6 +200,9 @@ fi
%changelog
+* Tue Feb 17 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-12
+- add cinnamon badge
+
* Sat Jan 31 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-11
- add badges for Mate and Window Maker (#1178498)
--
cgit v0.10.2
>From f0e01d3f12e0be60335efb506215949228f927f3 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Thu, 19 Feb 2015 22:05:05 +0100
Subject: fix build of cinnamon badge
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index b63a5bc..663f64c 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -78,7 +78,7 @@ A LightDM greeter that uses the GTK2 toolkit.
%patch100 -p1 -b .lp#1024482
%patch101 -p0 -b .badges
-%patch102 -p0 -b .cinnamon-badges
+%patch102 -p1 -b .cinnamon-badges
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
@@ -200,6 +200,9 @@ fi
%changelog
+* Fri Feb 19 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-13
+- fix build of cinnamon badge
+
* Tue Feb 17 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-12
- add cinnamon badge
--
cgit v0.10.2
>From 6fa66c2a127a6518f46e23b2ee2dbf74f17f3f23 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Feb 2015 08:56:57 -0600
Subject: 1.8.5-14
- merge epel branch mods
- (fedora) drop Requires: system-logos (not used anymore)
diff --git a/lightdm-gtk-greeter-1.8.1-rhel7.patch b/lightdm-gtk-greeter-1.8.1-rhel7.patch
new file mode 100644
index 0000000..c25213a
--- /dev/null
+++ b/lightdm-gtk-greeter-1.8.1-rhel7.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf.fedora lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf
+--- lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf.fedora 2014-02-20 06:49:39.444554362 -0600
++++ lightdm-gtk-greeter-1.8.1/data/lightdm-gtk-greeter.conf 2014-02-20 06:50:30.212012176 -0600
+@@ -16,7 +16,7 @@
+ # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
+ #
+ [greeter]
+-#background=
++background=/usr/share/backgrounds/day.jpg
+ #theme-name=
+ #icon-theme-name=
+ #font-name=
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 663f64c..2473c49 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 13%{?dist}
+Release: 14%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -12,6 +12,7 @@ Source0: https://launchpad.net/lightdm-gtk-greeter/1.8/%{version}/+downlo
# tweak default config
Patch1: lightdm-gtk-greeter-1.8.1-fedora.patch
+Patch2: lightdm-gtk-greeter-1.8.1-rhel7.patch
## upstreamable patches
# avoid setting background when given bogus screen geometry
@@ -52,12 +53,15 @@ A LightDM greeter that uses the GTK3 toolkit.
Summary: Common files for %{name}
# when -common was split out
Conflicts: lightdm-gtk < 1.8.5-5
-# for /usr/share/backgrounds/default.png
+# for default background/wallpaper
+%if 0%{?fedora}
Requires: desktop-backgrounds-compat
+%endif
+%if 0%{?rhel}
+Requires: system-logos
+%endif
# owner of HighContrast gtk/icon themes
Requires: gnome-themes-standard
-# for /usr/share/pixmaps/fedora-logo-small.png
-Requires: system-logos
BuildArch: noarch
%description common
%{summary}.
@@ -83,7 +87,11 @@ A LightDM greeter that uses the GTK2 toolkit.
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
+%if 0%{?rhel} > 6
+%patch2 -p1 -b .rhel7
+%else
%patch1 -p1 -b .fedora
+%endif
%build
@@ -200,6 +208,10 @@ fi
%changelog
+* Fri Feb 20 2015 Rex Dieter <rdieter at fedoraproject.org> - 1.8.5-14
+- merge epel branch mods
+- (fedora) drop Requires: system-logos (not used anymore)
+
* Fri Feb 19 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-13
- fix build of cinnamon badge
--
cgit v0.10.2
>From e4626538e2c72ecc23c5e0ae9bf4e340907bee5c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Feb 2015 09:01:02 -0600
Subject: fix changelog date
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 2473c49..c14d0da 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -212,7 +212,7 @@ fi
- merge epel branch mods
- (fedora) drop Requires: system-logos (not used anymore)
-* Fri Feb 19 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-13
+* Thu Feb 19 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-13
- fix build of cinnamon badge
* Tue Feb 17 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.5-12
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/lightdm-gtk.git/commit/?h=master&id=04c70e5483f26933b659c2b6051c6d9c531e900c
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list