rdieter pushed to lightdm-gtk (f22). "Revert "change background for epel" (..more)"

[notifications at fedoraproject.org]

>From 5799e9924087238ea71fe3f5a2f008e7601eba68 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Feb 2015 09:02:36 -0600
Subject: Revert "change background for epel"

This reverts commit 76a9b0702117ef6f340c31d816bcee84ed354087.

diff --git a/lightdm-gtk-greeter-1.5.2-redhat.patch b/lightdm-gtk-greeter-1.5.2-redhat.patch
deleted file mode 100644
index 6ae924f..0000000
--- a/lightdm-gtk-greeter-1.5.2-redhat.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/day.jpg
- #theme-name=
- #icon-theme-name=
- #font-name=
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index ab9a6b4..55f9140 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,18 +4,14 @@
 Summary:        LightDM GTK+ Greeter
 Name:           lightdm-gtk
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        2%{?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
 
 # tweak default config
-%if 0%{?fedora}
 Patch1:         lightdm-gtk-greeter-1.5.2-fedora.patch
-%else
-Patch1:         lightdm-gtk-greeter-1.5.2-redhat.patch
-%endif
 
 ## upstreamable patches
 # avoid setting background when given bogus screen geometry
@@ -36,10 +32,8 @@ Provides:       lightdm-gtk-greeter = %{version}-%{release}
 Provides:       lightdm-greeter = 1.2
 
 Requires:       lightdm%{?_isa}
-%if 0%{?fedora}
 # for /usr/share/backgrounds/default.png
 Requires:       desktop-backgrounds-compat
-%endif
 # owner of HighContrast gtk/icon themes
 Requires:       gnome-themes-standard
 # for /usr/share/pixmaps/fedora-logo-small.png
@@ -55,7 +49,7 @@ A LightDM greeter that uses the GTK+ toolkit.
 %prep
 %setup -q -n lightdm-gtk-greeter-%{version}
 
-%patch1 -p1 -b .greeter_background
+%patch1 -p1 -b .fedora
 %patch50 -p1 -b .bg_crash
 %patch51 -p1 -b .validate_session
 
@@ -101,9 +95,6 @@ fi
 
 
 %changelog
-* Sat May 17 2014 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-3
-- change background for epel
-
 * 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


	http://pkgs.fedoraproject.org/cgit/lightdm-gtk.git/commit/?h=f22&id=5799e9924087238ea71fe3f5a2f008e7601eba68

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390