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

---- Files affected:
packages/gpicview:
   gpicview.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/gpicview/gpicview.spec
diff -u packages/gpicview/gpicview.spec:1.5 packages/gpicview/gpicview.spec:1.6
--- packages/gpicview/gpicview.spec:1.5 Tue Sep 14 21:48:53 2010
+++ packages/gpicview/gpicview.spec     Mon Aug 15 10:11:29 2011
@@ -1,18 +1,28 @@
 # $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:       GPicView: Picture viewer of LXDE
 Name:          gpicview
-Version:       0.2.1
+Version:       0.2.2
 Release:       1
 License:       GPL v2, LGPL
 Group:         X11/Applications
-Source0:       
https://downloads.sourceforge.net/project/lxde/GPicView%20%28image%20Viewer%29/GPicView%20%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a2de255bf9bdc40746c0dc89b3454a10
+Source0:       http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+# Source0-md5: 943da9f4a23541accd5acdd4fb69966f
 URL:           http://wiki.lxde.org/en/GPicView
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel
-BuildRequires: gtk+2-devel
+%{?with_gtk2:BuildRequires:    gtk+2-devel >= 2:2.12.0}
+%{?with_gtk3:BuildRequires:    gtk+3-devel}
 BuildRequires: intltool
 BuildRequires: libjpeg-devel
 BuildRequires: libtool
@@ -36,7 +46,8 @@
 %{__autoheader}
 %{__autoconf}
 %{__intltoolize}
-%configure
+%configure \
+       %{?with_gtk3:--enable-gtk3}
 %{__make}
 
 %install
@@ -45,7 +56,7 @@
        DESTDIR=$RPM_BUILD_ROOT
 
 # missing in glibc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
 
@@ -67,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/08/15 08:11:29  glen
+- up to 0.2.2, gtk3 bcond
+
 Revision 1.5  2010/09/14 19:48:53  glen
 - more precise urls
 
================================================================

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

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

Reply via email to