up to 1.22.0

[packages/marco.git] / marco.spec

diff --git a/marco.spec b/marco.spec
index 21a986d7622fd505028f45979702542859ecbd8f..153801fabfc16bf2b8f71a2b698d4224c40d886e 100644 (file)
--- a/marco.spec
+++ b/marco.spec
@@ -2,36 +2,28 @@
 # - 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.8.2
+Version:       1.22.0
 Release:       1
 License:       LGPL v2+ and GPL v2+
 Group:         X11/Window Managers
-Source0:       http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 265dc15c523a4688de0e10eb976df751
-# 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
-Patch1:                initialise_all_workspace_names.patch
+Source0:       http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
+# Source0-md5: 8c77596d0b4d5a87235b0f1b38847687
 URL:           http://wiki.mate-desktop.org/mate-window-manager
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools >= 0.10.40
-BuildRequires: glib2-devel >= 1:2.26.0
-%{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.20.0}
-%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.0.0}
-BuildRequires: intltool >= 0.35.0
-%{!?with_gtk3:BuildRequires:   libcanberra-gtk-devel}
-%{?with_gtk3:BuildRequires:    libcanberra-gtk3-devel}
-BuildRequires: libgtop-devel
+BuildRequires: glib2-devel >= 1:2.50.0
+BuildRequires: gtk+3-devel >= 3.22.0
+BuildRequires: intltool >= 0.50.1
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: libgtop-devel >= 2.0
 BuildRequires: mate-common
+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
@@ -39,21 +31,25 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
 BuildRequires: xorg-lib-libX11-devel
-BuildRequires: xorg-lib-libXcomposite-devel >= 0.2
+BuildRequires: xorg-lib-libXcomposite-devel >= 0.3
 BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXpresent-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xz
+BuildRequires: yelp-tools
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2 >= 1:2.26.0
+Requires:      glib2 >= 1:2.50.0
 Requires:      gsettings-desktop-schemas
+Requires:      gtk+3 >= 3.22.0
 Requires:      mate-icon-theme
 Requires:      mate-settings-daemon
+Requires:      zenity
 Suggests:      mate-control-center
-Suggests:      mate-dialogs
 # can use any gtk+2 themes nicely, Adwaita specially
 Suggests:      %{name}-themes
 Obsoletes:     mate-window-manager
@@ -71,12 +67,12 @@ pakietu GNOME Metacity.
 Summary:       Marco (MATE window manager) library
 Summary(pl.UTF-8):     Biblioteka Macro (zarządcy okien MATE)
 Group:         X11/Libraries
-Requires:      glib2 >= 1:2.26.0
-%{!?with_gtk3:Requires:        gtk+2 >= 2:2.20.0}
-%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
+Requires:      glib2 >= 1:2.50.0
+Requires:      gtk+3 >= 3.22.0
+Requires:      mate-desktop-libs >= 1.9.3
 Requires:      pango >= 1:1.2.0
 Requires:      startup-notification >= 0.7
-Requires:      xorg-lib-libXcomposite >= 0.2
+Requires:      xorg-lib-libXcomposite >= 0.3
 Obsoletes:     mate-window-manager-libs >= 1.4.1-2
 
 %description libs
@@ -92,9 +88,9 @@ Summary:      Development files for Marco (Mate window manager)
 Summary(pl.UTF-8):     Pliki programistyczne Marco (zarządcy okien MATE)
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.26.0
-%{!?with_gtk3:Requires:        gtk+2-devel >= 2:2.20.0}
-%{?with_gtk3:Requires: gtk+3-devel >= 3.0.0}
+Requires:      glib2-devel >= 1:2.50.0
+Requires:      gtk+3-devel >= 3.22.0
+Requires:      mate-desktop-devel >= 1.9.3
 Obsoletes:     mate-window-manager-devel
 
 %description devel
@@ -118,8 +114,6 @@ Motywy dla zarządcy okien MATE
 
 %prep
 %setup -q
-%patch0 -p1
-#patch1 -p1
 
 %build
 %{__libtoolize}
@@ -128,12 +122,11 @@ Motywy dla zarządcy okien MATE
 %{__autoheader}
 %{__automake}
 %configure \
-       MATEDIALOG=%{_bindir}/matedialog \
+       ZENITY=%{_bindir}/zenity \
        --disable-scrollkeeper \
        --disable-silent-rules \
        --disable-static \
        --with-gnu-ld \
-       %{?with_gtk3:--with-gtk=3.0} \
        --with-x
 
 %{__make}
@@ -145,8 +138,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmarco-private.la
 
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/marco.convert
+# ku_IQ is outdated version of ku; the rest not supported by glibc
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,jv,ku_IQ}
 
 desktop-file-install \
        --remove-category="MATE" \
@@ -189,7 +182,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)