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

qboosh qboosh at pld-linux.org
Mon Jul 7 19:48:03 CEST 2014


commit c02ebaff99bf47a06a4c42272267a9ff801a4eae
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jul 7 19:52:41 2014 +0200

    - cmn locale is supported now
    - added gtk3 bcond

 mate-polkit.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/mate-polkit.spec b/mate-polkit.spec
index 974cdb4..14c240e 100644
--- a/mate-polkit.spec
+++ b/mate-polkit.spec
@@ -1,4 +1,8 @@
 # TODO: recheck cairo-gobject BR
+#
+# Conditional build:
+%bcond_with	gtk3		# use GTK+ 3.x instead of 2.x
+
 Summary:	Integrates polkit authentication for MATE desktop
 Summary(pl.UTF-8):	Integracja uwierzytelniania polkit ze środowiskiem MATE
 Name:		mate-polkit
@@ -9,11 +13,12 @@ Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
 # Source0-md5:	bd7dfb225e1ba6aac3c5752d496071d8
 URL:		http://wiki.mate-desktop.org/mate-polkit
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel >= 0.10.40
 BuildRequires:	gobject-introspection-devel >= 0.6.2
-BuildRequires:	gtk+2-devel >= 2:2.17.1
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.17.1}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
 BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libtool
@@ -26,7 +31,8 @@ BuildRequires:	xz
 # https://bugzilla.redhat.com/show_bug.cgi?id=847419#c17 asserts this is a bug (elsewhere)
 # but I'm not entirely sure -- rex
 BuildRequires:	cairo-gobject-devel
-Requires:	gtk+2 >= 2:2.17.1
+%{!?with_gtk3:Requires:	gtk+2 >= 2:2.17.1}
+%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
 Requires:	polkit-libs >= 0.97
 #Provides:	PolicyKit-authentication-agent
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,7 +50,8 @@ Summary:	Development files for mate-polkit library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki mate-polkit
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.17.1
+%{!?with_gtk3:Requires:	gtk+2-devel >= 2:2.17.1}
+%{?with_gtk3:Requires:	gtk+3-devel >= 3.0.0}
 Requires:	polkit-devel >= 0.97
 
 %description devel
@@ -64,7 +71,8 @@ Pliki programistyczne biblioteki mate-polkit.
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--disable-static
+	--disable-static \
+	%{?with_gtk3:--with-gtk=3.0}
 
 %{__make}
 
@@ -74,7 +82,6 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libpolkit-gtk-mate-1.la
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
 
 %find_lang %{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-polkit.git/commitdiff/c02ebaff99bf47a06a4c42272267a9ff801a4eae



More information about the pld-cvs-commit mailing list