packages: lxsession/lxsession.spec - up to 0.4.6.1, added gtk3 bcond

[glen]

Author: glen                         Date: Mon Aug 15 07:51:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4.6.1, added gtk3 bcond

---- Files affected:
packages/lxsession:
   lxsession.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/lxsession/lxsession.spec
diff -u packages/lxsession/lxsession.spec:1.4 packages/lxsession/lxsession.spec:1.5
--- packages/lxsession/lxsession.spec:1.4	Fri May 27 11:45:56 2011
+++ packages/lxsession/lxsession.spec	Mon Aug 15 09:51:53 2011
@@ -1,16 +1,26 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with		gtk3		# build GTK+3, disables GTK+2
+%bcond_without		gtk2	# build with GTK+2
+
+%if %{with gtk3}
+%undefine	with_gtk2
+%endif
+
 Summary:	Default session manager for LXDE
 Name:		lxsession
-Version:	0.4.5
+Version:	0.4.6.1
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5:	d5cd0cb733748191b2c7371c9efda155
+# Source0-md5:	e456b64c5ab3652a4dec661ec706dc6e
 URL:		http://wiki.lxde.org/en/LXSession
 BuildRequires:	dbus-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.12.0
+%{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.12.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel}
 BuildRequires:	intltool
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,16 +37,16 @@
 %setup -q
 
 %build
-%configure
+%configure \
+	%{?with_gtk3:--enable-gtk3}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{frp,ur_PK}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{frp,ur_PK}
 
 %find_lang %{name}
 
@@ -46,6 +56,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README
+%attr(755,root,root) %{_bindir}/lxlock
 %attr(755,root,root) %{_bindir}/lxsession*
 %{_datadir}/lxsession
 %{_mandir}/man1/lxsession*
@@ -56,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/08/15 07:51:53  glen
+- up to 0.4.6.1, added gtk3 bcond
+
 Revision 1.4  2011/05/27 09:45:56  glen
 - up to 0.4.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxsession/lxsession.spec?r1=1.4&r2=1.5&f=u