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

qboosh qboosh at pld-linux.org
Tue Jul 8 23:12:30 CEST 2014


commit 77ce4cb5c63d2d15227dfe1a2f7707d44dc21146
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 8 23:17:12 2014 +0200

    - cmn locale is supported now
    - added gtk3 bcond

 mate-screensaver.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index aa07481..a18c6ad 100644
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	gtk3		# use GTK+ 3.x instead of 2.x
+
 Summary:	MATE screensaver
 Summary(pl.UTF-8):	Wygaszacz ekranu MATE
 Name:		mate-screensaver
@@ -15,7 +19,8 @@ BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.30
 BuildRequires:	gettext-devel >= 0.10.40
 BuildRequires:	glib2-devel >= 1:2.26.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.14.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libmatekbd-devel >= 1.7.1
 BuildRequires:	libnotify-devel >= 0.7.0
@@ -36,7 +41,8 @@ BuildRequires:	xz
 Requires(post,preun):	glib2 >= 1:2.26.0
 Requires:	dbus-glib >= 0.30
 Requires:	glib2 >= 1:2.26.0
-Requires:	gtk+2 >= 2:2.14.0
+%{!?with_gtk3:Requires:	gtk+2 >= 2:2.14.0}
+%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
 Requires:	libmatekbd >= 1.7.1
 Requires:	libnotify >= 0.7.0
 Requires:	mate-desktop >= 1.7.1
@@ -68,6 +74,7 @@ być dobrze zintegrowany ze środowiskiem graficznym.
 	--enable-locking \
 	--enable-pam \
 	--disable-silent-rules \
+	%{?with_gtk3:--with-gtk=3.0} \
 	--with-mit-ext \
 	--with-shadow \
 	--with-xf86gamma-ext \
@@ -85,7 +92,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/mate-screensaver
 
 # mate < 1.5 did not exist in PLD, avoid dependency on mate-conf
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/org.mate.screensaver.gschema.migrate
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
 
 %find_lang %{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-screensaver.git/commitdiff/77ce4cb5c63d2d15227dfe1a2f7707d44dc21146



More information about the pld-cvs-commit mailing list