[gnome-session/f14/master] build against gtk2
Matthias Clasen
mclasen at fedoraproject.org
Sat Aug 7 01:42:07 UTC 2010
commit c017f5996e79ac767dfde1f4915756c0b49985eb
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri Aug 6 21:40:55 2010 -0400
build against gtk2
gnome-session.spec | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/gnome-session.spec b/gnome-session.spec
index e655fff..636ded8 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -1,4 +1,4 @@
-%define gtk_version 2.90
+%define gtk_version 2.20
%define dbus_glib_version 0.70
%define dbus_version 0.90
%define gnome_keyring_version 2.21.92
@@ -36,7 +36,7 @@ Requires: polkit-desktop-policy
## we conflict with gdm that contains the GNOME gdm xsession
Conflicts: gdm < 1:2.6.0.8-5
-BuildRequires: gtk3-devel >= %{gtk_version}
+BuildRequires: gtk2-devel >= %{gtk_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
@@ -102,12 +102,10 @@ autoreconf -i -f
%build
%configure --enable-docbook-docs \
--docdir=%{_datadir}/doc/%{name}-%{version} \
- --with-gtk=3.0
+ --with-gtk=2.0
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -130,9 +128,6 @@ cp AUTHORS COPYING NEWS README $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
%find_lang %{po_package}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
More information about the scm-commits
mailing list