[packages/marco] up to 1.18.0

[atler]

commit b59e85c1d2b14e1422c755db571c633f5d77e9cc
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Mar 15 22:52:27 2017 +0100

    up to 1.18.0
    
    - upstream switched to gtk3 exclusively
    - drop unsupported ku_IQ locale

 marco.spec | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/marco.spec b/marco.spec
index 5f84569..823c79f 100644
--- a/marco.spec
+++ b/marco.spec
@@ -2,18 +2,15 @@
 # - subpackages for themes (see metacity.spec)
 # - find proper packages for %files
 #
-# Conditional build:
-%bcond_with	gtk3	# use GTK 3.x instead of 2.x
-#
 Summary:	MATE Desktop window manager
 Summary(pl.UTF-8):	Zarządca okien środowiska MATE Desktop
 Name:		marco
-Version:	1.16.0
+Version:	1.18.0
 Release:	1
 License:	LGPL v2+ and GPL v2+
 Group:		X11/Window Managers
-Source0:	http://pub.mate-desktop.org/releases/1.16/%{name}-%{version}.tar.xz
-# Source0-md5:	9301161d69c78a2b4f4878399161e012
+Source0:	http://pub.mate-desktop.org/releases/1.18/%{name}-%{version}.tar.xz
+# Source0-md5:	c0d14cd1d2524e460cb84819cbd863ea
 # https://bugzilla.gnome.org/show_bug.cgi?id=622517
 Patch0:		Allow-breaking-out-from-maximization-during-mouse.patch
 # https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/583847
@@ -25,14 +22,12 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gdk-pixbuf2-devel >= 2.0
 BuildRequires:	gettext-tools >= 0.10.40
 BuildRequires:	glib2-devel >= 1:2.32.0
-%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.24.0}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
+BuildRequires:	gtk+3-devel >= 3.14
 BuildRequires:	intltool >= 0.50.1
-%{!?with_gtk3:BuildRequires:	libcanberra-gtk-devel}
-%{?with_gtk3:BuildRequires:	libcanberra-gtk3-devel}
+BuildRequires:	libcanberra-gtk3-devel
 BuildRequires:	libgtop-devel
 BuildRequires:	mate-common
-%{?with_gtk3:BuildRequires:	mate-desktop-devel >= 1.9.3}
+BuildRequires:	mate-desktop-devel >= 1.9.3
 BuildRequires:	pango-devel >= 1:1.2.0
 BuildRequires:	rpmbuild(find_lang) >= 1.36
 BuildRequires:	startup-notification-devel >= 0.7
@@ -74,9 +69,8 @@ Summary:	Marco (MATE window manager) library
 Summary(pl.UTF-8):	Biblioteka Macro (zarządcy okien MATE)
 Group:		X11/Libraries
 Requires:	glib2 >= 1:2.32.0
-%{!?with_gtk3:Requires:	gtk+2 >= 2:2.24.0}
-%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
-%{?with_gtk3:Requires:	mate-desktop-libs >= 1.9.3}
+Requires:	gtk+3 >= 3.14
+Requires:	mate-desktop-libs >= 1.9.3
 Requires:	pango >= 1:1.2.0
 Requires:	startup-notification >= 0.7
 Requires:	xorg-lib-libXcomposite >= 0.3
@@ -96,9 +90,8 @@ Summary(pl.UTF-8):	Pliki programistyczne Marco (zarządcy okien MATE)
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.32.0
-%{!?with_gtk3:Requires:	gtk+2-devel >= 2:2.24.0}
-%{?with_gtk3:Requires:	gtk+3-devel >= 3.0.0}
-%{?with_gtk3:Requires:	mate-desktop-devel >= 1.9.3}
+Requires:	gtk+3-devel >= 3.14
+Requires:	mate-desktop-devel >= 1.9.3
 Obsoletes:	mate-window-manager-devel
 
 %description devel
@@ -137,7 +130,6 @@ Motywy dla zarządcy okien MATE
 	--disable-silent-rules \
 	--disable-static \
 	--with-gnu-ld \
-	%{?with_gtk3:--with-gtk=3.0} \
 	--with-x
 
 %{__make}
@@ -149,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmarco-private.la
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ku_IQ,jv}
 
 desktop-file-install \
 	--remove-category="MATE" \
@@ -192,7 +184,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmarco-private.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmarco-private.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmarco-private.so.1
 
 %files devel
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/marco.git/commitdiff/b59e85c1d2b14e1422c755db571c633f5d77e9cc