Author: glen                         Date: Mon Aug 15 07:48:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.1.11, added gtk3 bcond

---- Files affected:
packages/lxterminal:
   lxterminal.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/lxterminal/lxterminal.spec
diff -u packages/lxterminal/lxterminal.spec:1.6 
packages/lxterminal/lxterminal.spec:1.7
--- packages/lxterminal/lxterminal.spec:1.6     Thu Sep  2 20:47:39 2010
+++ packages/lxterminal/lxterminal.spec Mon Aug 15 09:48:37 2011
@@ -1,22 +1,34 @@
 # $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:       LXTerminal is the standard terminal emulator of LXDE
 Name:          lxterminal
-Version:       0.1.9
+Version:       0.1.11
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5: cb10cc667611dce3c141294712049c43
+# Source0-md5: fd9140b45c0f28d021253c4aeb8c4aea
 URL:           http://wiki.lxde.org/en/LXTerminal
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel
+%{?with_gtk2:BuildRequires:    gtk+2-devel}
+%{?with_gtk3:BuildRequires:    gtk+3-devel}
 BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
-BuildRequires: vte-devel
+%{?with_gtk3:BuildRequires:    vte-devel}
+%{?with_gtk2:BuildRequires:    vte0-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,16 +43,16 @@
 %{__autoheader}
 %{__autoconf}
 %{__intltoolize}
-%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}
 
@@ -62,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/08/15 07:48:37  glen
+- up to 0.1.11, added gtk3 bcond
+
 Revision 1.6  2010/09/02 18:47:39  glen
 - autoup to 0.1.9
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to