[packages/mate-netbook] - cmn locale is supported now - added gtk3 bcond

qboosh qboosh at pld-linux.org
Fri Jul 11 15:48:05 CEST 2014


commit 65489c234ed818f3ddbf33118145a03d3d652f9a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 11 15:52:51 2014 +0200

    - cmn locale is supported now
    - added gtk3 bcond

 mate-netbook.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/mate-netbook.spec b/mate-netbook.spec
index 95f22d3..6ac054a 100644
--- a/mate-netbook.spec
+++ b/mate-netbook.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	gtk3		# use GTK+ 3.x instead of 2.x
+
 Summary:	Simple window management tool
 Summary(pl.UTF-8):	Proste narzędzie do zarządzania oknami
 Name:		mate-netbook
@@ -12,12 +16,16 @@ BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel >= 0.10.40
 BuildRequires:	glib2-devel >= 2.0
-BuildRequires:	gtk+2-devel >= 2.0
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0}
 BuildRequires:	intltool >= 0.34
 BuildRequires:	libfakekey-devel
 BuildRequires:	libtool >= 1:1.4.3
-BuildRequires:	libunique-devel >= 1.0
-BuildRequires:	libwnck2-devel >= 1.0
+%{!?with_gtk3:BuildRequires:	libunique-devel >= 1.0}
+%{?with_gtk3:BuildRequires:	libunique3-devel >= 3.0}
+%{?with_gtk3:BuildRequires:	libwnck-devel >= 3.0}
+%{!?with_gtk3:BuildRequires:	libwnck2-devel >= 1.0}
+BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-panel-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.36
@@ -58,7 +66,8 @@ Proste narzędzie do zarządzania oknami, które:
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	%{?with_gtk3:--with-gtk=3.0}
 
 %{__make}
 
@@ -71,8 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 # mate < 1.5 did not exist in PLD, avoid dependency on mate-conf
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-maximus.convert
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
-
 %find_lang %{name}
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-netbook.git/commitdiff/65489c234ed818f3ddbf33118145a03d3d652f9a



More information about the pld-cvs-commit mailing list