rdieter pushed to lightdm-gtk (master). "Merge branch 'master' into epel7"

[notifications at fedoraproject.org]

>From 61f12bf8ecc98833b9c2ac475cde06cdf66e423d Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Thu, 19 Feb 2015 22:54:01 +0100
Subject: fix bogus date in %changelog


diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 663f64c..42fda19 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -200,7 +200,7 @@ fi
 
 
 %changelog
-* 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


>From 7d851f8837c8655894d1d03db338ff28d93af56f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 24 Mar 2015 14:27:39 -0500
Subject: drop (temporary) -gtk2 subpkg support


diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index c14d0da..8e6294a 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -1,10 +1,13 @@
 
 %global _hardened_build 1
 
+# Define to re-enable -gtk2 subpkg support -- rex
+#global gtk2 1
+
 Summary:        LightDM GTK3 Greeter
 Name:           lightdm-gtk
 Version:        1.8.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 License:        GPLv3+
 URL:            https://launchpad.net/lightdm-gtk-greeter
@@ -35,7 +38,11 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
 BuildRequires:  pkgconfig(gtk+-3.0)
+%if 0%{?gtk2}
 BuildRequires:  pkgconfig(gtk+-2.0)
+%else
+Obsoletes:      lightdm-gtk2 < 1.8.5-15
+%endif
 
 Obsoletes:      lightdm-gtk-greeter < 1.1.5-4
 Provides:       lightdm-gtk-greeter = %{version}-%{release}
@@ -208,6 +215,9 @@ fi
 
 
 %changelog
+* Tue Mar 24 2015 Rex Dieter <rdieter at fedoraproject.org> 1.8.5-15
+- drop (temporary) -gtk2 subpkg support
+
 * 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)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/lightdm-gtk.git/commit/?h=master&id=e92ac0f3532169a1e110e730850695d9ce7cd787

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