- cmn locale is supported now

[packages/mate-panel.git] / mate-panel.spec

diff --git a/mate-panel.spec b/mate-panel.spec
index 38b5bc386f1e265c0187f7c1f11572e02e61031f..8348bdf0ced9a1303ed6e199784c6ecf9086460a 100644 (file)
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
+%bcond_with    gtk3            # use GTK+ 3.x instead of 2.x
 
 Summary:       MATE Desktop panel applets
 Summary(pl.UTF-8):     Aplety panelu dla środowiska MATE Desktop
 Name:          mate-panel
-Version:       1.6.2
-Release:       1
+Version:       1.8.0
+Release:       2
 License:       LGPL v2+ (library), GPL v2+ (applets)
 Group:         X11/Applications
-Source0:       http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: bffcebcc8edc10308799b3d339b67a53
+Source0:       http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: fe1a3ff81a5d12cdbb8f3882cbb4f188
 Patch0:                no-xdg-menu-prefix.patch
-Patch1:                use-libwnck.patch
 URL:           http://wiki.mate-desktop.org/mate-panel
 BuildRequires: NetworkManager-devel >= 0.6
 BuildRequires: autoconf >= 2.53
@@ -27,19 +27,23 @@ BuildRequires:      gdk-pixbuf2-devel >= 2.7.1
 BuildRequires: gettext-devel >= 0.12
 BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gobject-introspection-devel >= 0.6.7
-BuildRequires: gtk+2-devel >= 2:2.19.7
+%{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.19.7}
+%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.0.0}
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: intltool >= 0.40.0
-BuildRequires: libcanberra-gtk-devel
-BuildRequires: libmateweather-devel >= 1.5.0
-BuildRequires: libtool >= 1:1.4.3
+%{!?with_gtk3:BuildRequires:   libcanberra-gtk-devel}
+%{?with_gtk3:BuildRequires:    libcanberra-gtk3-devel}
+%{!?with_gtk3:BuildRequires:   libmateweather-devel >= 1.5.0}
+%{?with_gtk3:BuildRequires:    libmateweather-devel >= 1.7.0}
 BuildRequires: librsvg-devel >= 2.0
-BuildRequires: libwnck2-devel >= 2.30.7-2
+BuildRequires: libtool >= 1:1.4.3
+%{?with_gtk3:BuildRequires:    libwnck-devel >= 3.0.0}
+%{!?with_gtk3:BuildRequires:   libwnck2-devel >= 2.30.7-2}
 BuildRequires: mate-common
 BuildRequires: mate-desktop-devel >= 1.5.0
-%{?with_apidocs:BuildRequires: mate-doc-utils}
 BuildRequires: mate-menus-devel >= 1.1.0
 BuildRequires: pango-devel >= 1:1.15.4
+BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.36
 BuildRequires: tar >= 1:1.22
@@ -49,6 +53,7 @@ BuildRequires:        xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXrandr-devel >= 1.2.0
 BuildRequires: xz
+BuildRequires: yelp-tools
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus >= 1.1.2
 Requires:      dbus-glib >= 0.80
@@ -56,11 +61,13 @@ Requires:   dconf >= 0.13.4
 Requires:      desktop-file-utils
 Requires:      gsettings-desktop-schemas
 Requires:      gtk-update-icon-cache
-Requires:      libmateweather >= 1.5.0
-Requires:      libwnck2 >= 2.30.7-2
+%{!?with_gtk3:Requires:        libmateweather >= 1.5.0}
+%{?with_gtk3:Requires: libmateweather >= 1.7.0}
+%{?with_gtk3:Requires: libwnck >= 3.0.0}
+%{!?with_gtk3:Requires:        libwnck2 >= 2.30.7-2}
+Requires:      marco
 Requires:      mate-desktop >= 1.5.0
 Requires:      mate-menus >= 1.1.0
-Requires:      mate-window-manager
 Suggests:      mate-settings-daemon
 # for fish
 Requires:      fortune-mod
@@ -80,7 +87,8 @@ Group:                Libraries
 Requires:      cairo >= 1.0.0
 Requires:      gdk-pixbuf2 >= 2.7.1
 Requires:      glib2 >= 1:2.26.0
-Requires:      gtk+2 >= 2:2.19.7
+%{!?with_gtk3:Requires:        gtk+2 >= 2:2.19.7}
+%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
 Requires:      pango >= 1:1.15.4
 Requires:      xorg-lib-libXrandr >= 1.2.0
 
@@ -97,7 +105,8 @@ License:     LGPL v2+
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      glib2-devel >= 1:2.26.0
-Requires:      gtk+2-devel >= 2:2.19.7
+%{!?with_gtk3:Requires:        gtk+2-devel >= 2:2.19.7}
+%{?with_gtk3:Requires: gtk+3-devel >= 3.0.0}
 
 %description devel
 Development files for libmate-panel-applet library.
@@ -110,6 +119,9 @@ Summary:    API documentation for libmate-panel-applet library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libmate-panel-applet
 Group:         Documentation
 Requires:      gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 API documentation for libmate-panel-applet library.
@@ -120,7 +132,6 @@ Dokumentacja API biblioteki libmate-panel-applet.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}