rdieter pushed to lightdm (epel7). "Revert "gobject: add versioned Requires: glib2 dep" (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 15 08:34:23 UTC 2015


>From c4d990a2ed31a86267bc583b984a564629b57fd3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 15 Apr 2015 03:33:28 -0500
Subject: Revert "gobject: add versioned Requires: glib2 dep"

This reverts commit 523c1a58babbd12da8167ebae7dab39e3f674cfb.

diff --git a/lightdm.spec b/lightdm.spec
index 0a9799f..a1b2e89 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -5,7 +5,7 @@
 Name:    lightdm
 Summary: Lightweight Display Manager
 Version: 1.10.4
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -40,7 +40,6 @@ BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gmodule-export-2.0)
 BuildRequires: pkgconfig(gobject-2.0)
-%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.10")
 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
 BuildRequires: pkgconfig(libxklavier)
 BuildRequires: pkgconfig(QtCore)
@@ -87,7 +86,6 @@ Summary: LightDM GObject client library
 # requires greeters to manually
 # Requires: lightdm
 #Requires: %{name} = %{version}-%{release}
-Requires: glib2%{?_isa} >= %{glib2_version}
 %description gobject
 This package contains a GObject based library for LightDM clients to use to
 interface with LightDM.
@@ -251,9 +249,6 @@ exit 0
 
 
 %changelog
-* Wed Apr 15 2015 Rex Dieter <rdieter at fedoraproject.org> 1.10.4-2
-- -gobject: add versioned Requires: glib2 dep
-
 * Thu Nov 13 2014 Rex Dieter <rdieter at fedoraproject.org> 1.10.4-1
 - lightdm-1.10.4, update URL to 1.10-specific branch
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/lightdm.git/commit/?h=epel7&id=c4d990a2ed31a86267bc583b984a564629b57fd3


More information about the scm-commits mailing list