rdieter pushed to lightdm-gtk (epel7). "Merge branch 'master' into f22 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 19:35:39 UTC 2015
>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
>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=epel7&id=48929849aa04d885315d603c9b80d4a92b31d1d9
--
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