packages: lxlauncher/lxlauncher.spec, lxlauncher/lxlauncher-0.2.1-fix-segfa...

[glen]

Author: glen                         Date: Mon Aug 15 08:20:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.2.2, gtk3 bcond

---- Files affected:
packages/lxlauncher:
   lxlauncher.spec (1.5 -> 1.6) , lxlauncher-0.2.1-fix-segfault.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/lxlauncher/lxlauncher.spec
diff -u packages/lxlauncher/lxlauncher.spec:1.5 packages/lxlauncher/lxlauncher.spec:1.6
--- packages/lxlauncher/lxlauncher.spec:1.5	Wed Feb 23 22:40:10 2011
+++ packages/lxlauncher/lxlauncher.spec	Mon Aug 15 10:20:44 2011
@@ -1,16 +1,25 @@
 # $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:	lxauncher
 Name:		lxlauncher
-Version:	0.2.1
-Release:	2
+Version:	0.2.2
+Release:	1
 License:	GPL v3
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5:	5dbe6076eb1a411278e1fc2bccf2d75d
-Patch0:		%{name}-0.2.1-fix-segfault.patch
+# Source0-md5:	16df627447838b170a72cc3a9ee21497
 URL:		http://wiki.lxde.org/en/LXLauncher
 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 >= 0.40.0
 BuildRequires:	menu-cache-devel
 BuildRequires:	pkgconfig
@@ -23,10 +32,10 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-%configure
+%configure \
+	%{?with_gtk3:--enable-gtk3}
 touch po/stamp-it
 %{__make}
 
@@ -58,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/08/15 08:20:44  glen
+- up to 0.2.2, gtk3 bcond
+
 Revision 1.5  2011/02/23 21:40:10  megabajt
 - drop ur_PK locale (ur locale already exists)
 - release 2
================================================================

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