up to 1.16.1

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

diff --git a/mate-panel.spec b/mate-panel.spec
index 3f95dfbac625640f2a4c988cb1a1d7d51e18b940..ba198cbc74c62276a1226c5b470feaede0d8bec2 100644 (file)
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -1,16 +1,17 @@
 #
 # 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.8.0
+Version:       1.16.1
 Release:       1
 License:       LGPL v2+ (library), GPL v2+ (applets)
 Group:         X11/Applications
-Source0:       http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: fe1a3ff81a5d12cdbb8f3882cbb4f188
+Source0:       http://pub.mate-desktop.org/releases/1.16/%{name}-%{version}.tar.xz
+# Source0-md5: 633a12ca4743f94cca9edf2866fca80f
 Patch0:                no-xdg-menu-prefix.patch
 URL:           http://wiki.mate-desktop.org/mate-panel
 BuildRequires: NetworkManager-devel >= 0.6
@@ -23,21 +24,27 @@ BuildRequires:      dconf-devel >= 0.13.4
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gdk-pixbuf2-devel >= 2.7.1
-BuildRequires: gettext-devel >= 0.12
-BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gettext-tools >= 0.12
+BuildRequires: glib2-devel >= 1:2.36
 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: intltool >= 0.50.1
+%{!?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.36.2
 BuildRequires: libtool >= 1:1.4.3
-BuildRequires: librsvg-devel >= 2.0
-BuildRequires: libwnck2-devel >= 2.30.7-2
+%{?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
+BuildRequires: mate-desktop-devel >= 1.9.3
 BuildRequires: mate-menus-devel >= 1.1.0
 BuildRequires: pango-devel >= 1:1.15.4
+BuildRequires: pkgconfig
+BuildRequires: python >= 2
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.36
 BuildRequires: tar >= 1:1.22
@@ -45,7 +52,7 @@ BuildRequires:        xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
-BuildRequires: xorg-lib-libXrandr-devel >= 1.2.0
+BuildRequires: xorg-lib-libXrandr-devel >= 1.3.0
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires:      %{name}-libs = %{version}-%{release}
@@ -55,10 +62,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}
+Requires:      librsvg >= 2.36.2
+%{?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-desktop >= 1.9.3
 Requires:      mate-menus >= 1.1.0
 Suggests:      mate-settings-daemon
 # for fish
@@ -78,10 +88,11 @@ License:    LGPL v2+
 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
+Requires:      glib2 >= 1:2.36
+%{!?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
+Requires:      xorg-lib-libXrandr >= 1.3.0
 
 %description libs
 Shared library for MATE panel applets.
@@ -95,8 +106,9 @@ Summary(pl.UTF-8):   Pliki programistyczne biblioteki libmate-panel-applet
 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
+Requires:      glib2-devel >= 1:2.36
+%{!?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.
@@ -109,6 +121,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.
@@ -131,9 +146,9 @@ Dokumentacja API biblioteki libmate-panel-applet.
        --libexecdir=%{_libdir}/%{name} \
        --enable-network-manager \
        --disable-schemas-compile \
-       --disable-scrollkeeper \
        --disable-silent-rules \
        --disable-static \
+       %{?with_gtk3:--with-gtk=3.0} \
        --with-html-dir=%{_gtkdocdir} \
        --with-x
 
@@ -144,11 +159,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-panel.convert
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
 
 desktop-file-install \
         --remove-category="MATE" \
@@ -156,10 +167,9 @@ desktop-file-install \
         --dir=$RPM_BUILD_ROOT%{_desktopdir} \
        $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-# update naming convention
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,jv,ku_IQ,pms}
 
-%find_lang %{name} --with-mate --with-omf --all-name
+%find_lang %{name} --with-mate --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT