Merge branch 'master' of git://git.pld-linux.org/packages/libappindicator

diff --combined libappindicator.spec
index 9a69c8dc2f06a6237d3da120adfd197c46e50c80,122f7ae35fa6fe424bb0069a604a19c700a90880..492a54b260e8d53b9d00b92a2b1f2bc1f5e695f1
--- 1/libappindicator.spec
--- 2/libappindicator.spec
+++ b/libappindicator.spec
@@@ -3,15 -3,9 +3,15 @@@
  %bcond_without        gtk2            # GTK+ 2.x version
  %bcond_without        gtk3            # GTK+ 3.x version
  %bcond_without        static_libs     # static libraries
 -%bcond_without        mono            # Mono bindings
 +%bcond_without        dotnet          # Mono bindings
  %bcond_without        vala            # Vala APIs
 -
 +#
 +%ifnarch %{ix86} %{x8664} arm aarch64 ia64 mips ppc ppc64 s390x sparc sparcv9 sparc64
 +%undefine     with_dotnet
 +%endif
 +%ifarch i386
 +%undefine     with_dotnet
 +%endif
  Summary:      Application indicators library
  Summary(pl.UTF-8):    Biblioteka wskaźników aplikacji
  Name:         libappindicator
@@@ -28,7 -22,7 +28,7 @@@ URL:          https://launchpad.net/libappindic
  BuildRequires:        autoconf >= 2.64
  BuildRequires:        automake >= 1:1.11
  BuildRequires:        dbus-glib-devel >= 0.82
 -%{?with_mono:BuildRequires:   dotnet-gtk-sharp2-devel >= 2.12.1}
 +%{?with_dotnet:BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.1}
  BuildRequires:        glib2-devel >= 1:2.26
  BuildRequires:        gobject-introspection-devel >= 0.10
  %{?with_gtk2:BuildRequires:   gtk+2-devel >= 2:2.18}
@@@ -39,14 -33,13 +39,14 @@@ BuildRequires:     gtk-doc >= 1.
  %{?with_gtk2:BuildRequires:   libindicator-devel >= 0.4.93}
  %{?with_gtk3:BuildRequires:   libindicator-gtk3-devel >= 0.4.93}
  BuildRequires:        libtool >= 2:2.2
 -%{?with_mono:BuildRequires:   mono-csharp >= 1.0}
 +%{?with_dotnet:BuildRequires: mono-csharp >= 1.0}
  # for mono-nunit >= 2.4.7
 -%{?with_mono:BuildRequires:   mono-devel >= 2.4.7}
 +%{?with_dotnet:BuildRequires: mono-devel >= 2.4.7}
  BuildRequires:        pkgconfig
  BuildRequires:        python-devel >= 2.3.5
  BuildRequires:        python-pygobject-devel >= 0.22
  BuildRequires:        python-pygtk-devel >= 2:2.14.0
 +BuildRequires:        sed >= 4.0
  %{?with_vala:BuildRequires:   vala >= 2:0.14.0}
  BuildRequires:        which
  BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@@ -249,6 -242,9 +249,9 @@@ API języka Vala do biblioteki libappin
  Summary:      API documentation for libappindicator library
  Summary(pl.UTF-8):    Dokumentacja API biblioteki libappindicator
  Group:                Documentation
+ %if "%{_rpmversion}" >= "5"
+ BuildArch:    noarch
+ %endif
  
  %description apidocs
  API documentation for libappindicator library (both GTK+ 2.x and 3.x
@@@ -263,9 -259,6 +266,9 @@@ Dokumentacja API biblioteki libappindic
  %patch0 -p1
  %patch1 -p1
  
 +# to allow deprecation warnings
 +%{__sed} -i -e 's/-Werror //' src/Makefile.am
 +
  %build
  %{__libtoolize}
  %{__aclocal}
@@@ -273,7 -266,7 +276,7 @@@
  %{__autoheader}
  %{__automake}
  
- for gtkver in %{?with_gtk2:2} %{?with_gtk3:3} ; do
+ for gtkver in %{?with_gtk2:2} %{?with_gtk3:3}; do
  install -d build-gtk$gtkver
  cd build-gtk$gtkver
  ../%configure \
@@@ -289,7 -282,7 +292,7 @@@ don
  %install
  rm -rf $RPM_BUILD_ROOT
  
- for gtkver in %{?with_gtk2:2} %{?with_gtk3:3} ; do
+ for gtkver in %{?with_gtk2:2} %{?with_gtk3:3}; do
  %{__make} -C build-gtk$gtkver install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
  done
@@@ -340,7 -333,7 +343,7 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libappindicator.a
  %endif
  
 -%if %{with mono}
 +%if %{with dotnet}
  %files -n dotnet-appindicator-sharp-gtk2
  %defattr(644,root,root,755)
  %{_prefix}/lib/mono/gac/appindicator-sharp