diff --git a/libappindicator-activate-support.patch b/libappindicator-activate-support.patch new file mode 100644 index 0000000..ba45f87 --- /dev/null +++ b/libappindicator-activate-support.patch @@ -0,0 +1,28 @@ +--- a/src/app-indicator.c ++++ b/src/app-indicator.c +@@ -1188,6 +1188,12 @@ bus_method_call (GDBusConnection * conne + { + gtk_widget_activate (menuitem); + } ++ } else if (g_strcmp0(method, "Activate") == 0) { ++ GtkMenu * menu = app_indicator_get_menu(app); ++ if (menu != NULL) { ++ gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 1, ++ gtk_get_current_event_time()); ++ } + } else { + g_warning("Calling method '%s' on the app-indicator and it's unknown", method); + } +--- a/src/notification-item.xml ++++ b/src/notification-item.xml +@@ -31,6 +31,10 @@ + + + ++ ++ ++ ++ + + + diff --git a/libappindicator.changes b/libappindicator.changes index 0c6bb43..8f8ba0f 100644 --- a/libappindicator.changes +++ b/libappindicator.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Apr 28 16:04:54 UTC 2017 - jengelh@inai.de + +- Rename %soname to %sover to better reflect its purpose. +- Update summaries. +- Remove redundant pkgconfig() reqiures; these are already + autodiscovered. + +------------------------------------------------------------------- +Wed Apr 19 19:50:11 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 12.10.1+bzr20170215 (changes since + 12.10.1+bzr20141110): + * Handle watcher service appearing and disappearing. + * Make test-simple-app really working. + * Fix icon and theme paths when running in $SNAP environment + (lp#1600136). + * Do not emit label changes when guide is still empty. + * Do not append the snap prefix if the icon is saved in a well + known readable path. +- Add libappindicator-activate-support.patch: Open menu on the + left-click action (lp#1403449). +- Rename python-appindicator to python2-appindicator. + ------------------------------------------------------------------- Thu Jul 7 09:25:12 UTC 2016 - t.gruner@katodev.de diff --git a/libappindicator.spec b/libappindicator.spec index 77c32a1..0fab04c 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -1,7 +1,7 @@ # # spec file for package libappindicator # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,28 @@ # -%define soname 1 -%define _version 12.10.1+15.04.20141110 -%bcond_with mono +%define sover 1 +%define _version 12.10.1+17.04.20170215 %if %{undefined with_mono} %bcond_without mono %endif +%bcond_with mono Name: libappindicator -Version: 12.10.1+bzr20141110 +Version: 12.10.1+bzr20170215 Release: 0 Summary: Application indicators library License: LGPL-2.0 and LGPL-3.0 and GPL-3.0 Group: System/Libraries Url: https://launchpad.net/libappindicator -Source: http://archive.ubuntu.com/ubuntu/pool/main/liba/%{name}/%{name}_%{_version}.orig.tar.gz +Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz # PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch hrvoje.senjan@gmail.com -- Fix location of .pc files. Patch0: 0001_Fix_mono_dir.patch +# PATCH-FIX-OPENSUSE libappindicator-activate-support.patch sor.alexei@meowr.ru -- Open menu on the left-click action. +Patch1: libappindicator-activate-support.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: vala BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbusmenu-glib-0.4) @@ -59,19 +61,22 @@ A library to allow applications to export a menu into the Unity Menu bar. Based on KSNI it also works in KDE and will fallback to generic Systray support if none of those are available. -%package -n python-appindicator +%package -n python2-appindicator Summary: Python 2 bindings for libappindicator -Group: System/Libraries -Requires: libappindicator%{soname} = %{version} +Group: Development/Languages/Python +Requires: libappindicator%{sover} = %{version} +# python-appindicator was last used in openSUSE Leap 42.2. +Provides: python-appindicator = %{version} +Obsoletes: python-appindicator < %{version} -%description -n python-appindicator +%description -n python2-appindicator This package contains the Python 2 bindings for the appindicator library. -%package -n libappindicator%{soname} +%package -n libappindicator%{sover} Summary: Application indicators library Group: System/Libraries -%description -n libappindicator%{soname} +%description -n libappindicator%{sover} A library to allow applications to export a menu into the Unity Menu bar. Based on KSNI it also works in KDE and will fallback to generic Systray support if none of those are available. @@ -87,19 +92,16 @@ library. %package devel Summary: Development files for libappindicator Group: Development/Libraries/C and C++ -Requires: libappindicator%{soname} = %{version} -Requires: pkg-config -Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(dbusmenu-glib-0.4) +Requires: libappindicator%{sover} = %{version} %description devel This package contains the development files for the appindicator library. -%package -n libappindicator3-%{soname} -Summary: Application indicators library -- GTK+ 3 +%package -n libappindicator3-%{sover} +Summary: Application indicators library for GTK+3 Group: System/Libraries -%description -n libappindicator3-%{soname} +%description -n libappindicator3-%{sover} A library to allow applications to export a menu into the Unity Menu bar. Based on KSNI it also works in KDE and will fallback to generic Systray support if none of those are available. @@ -117,10 +119,7 @@ library. %package -n libappindicator3-devel Summary: Development files for libappindicator3 Group: Development/Libraries/C and C++ -Requires: libappindicator3-%{soname} = %{version} -Requires: pkg-config -Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(dbusmenu-glib-0.4) +Requires: libappindicator3-%{sover} = %{version} %description -n libappindicator3-devel This package contains the development files for the appindicator3 library. @@ -136,7 +135,7 @@ libraries. %if %{with mono} %package -n appindicator-sharp -Summary: Application indicators library -- C# assembly CLI +Summary: Application indicators library for C# Group: System/Libraries %description -n appindicator-sharp @@ -155,12 +154,16 @@ This package contains the development files for the appindicator-sharp library. %endif %prep -%setup -q -n %{name}-%{_version} +%setup -q -c %patch0 -p1 +%patch1 -p1 %build -%global _configure ../configure NOCONFIGURE=1 ./autogen.sh +%if %{with mono} +export CSC=%{_bindir}/gmcs +%endif +%global _configure ../configure for ver in 2 3; do mkdir build-gtk$ver @@ -170,28 +173,25 @@ for ver in 2 3; do --enable-gtk-doc \ --disable-mono-test \ --with-gtk=$ver - make -j1 + make -j1 V=1 popd done %install -for ver in 2 3; do - pushd build-gtk$ver - %make_install - popd -done +%make_install -C build-gtk2 +%make_install -C build-gtk3 find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}%{python_sitearch} -%post -n libappindicator%{soname} -p /sbin/ldconfig +%post -n libappindicator%{sover} -p /sbin/ldconfig -%postun -n libappindicator%{soname} -p /sbin/ldconfig +%postun -n libappindicator%{sover} -p /sbin/ldconfig -%post -n libappindicator3-%{soname} -p /sbin/ldconfig +%post -n libappindicator3-%{sover} -p /sbin/ldconfig -%postun -n libappindicator3-%{soname} -p /sbin/ldconfig +%postun -n libappindicator3-%{sover} -p /sbin/ldconfig -%files -n python-appindicator +%files -n python2-appindicator %defattr(-,root,root) %doc COPYING COPYING.LGPL.2.1 README %dir %{python_sitearch}/appindicator/ @@ -202,10 +202,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_datadir}/pygtk/2.0/defs/ %{_datadir}/pygtk/2.0/defs/appindicator.defs -%files -n libappindicator%{soname} +%files -n libappindicator%{sover} %defattr(-,root,root) %doc COPYING COPYING.LGPL.2.1 README -%{_libdir}/libappindicator.so.%{soname}* +%{_libdir}/libappindicator.so.%{sover}* %files -n typelib-1_0-AppIndicator-0_1 %defattr(-,root,root) @@ -224,10 +224,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/vala/vapi/appindicator-0.1.vapi %{_datadir}/vala/vapi/appindicator-0.1.deps -%files -n libappindicator3-%{soname} +%files -n libappindicator3-%{sover} %defattr(-,root,root) %doc COPYING COPYING.LGPL.2.1 README -%{_libdir}/libappindicator3.so.%{soname}* +%{_libdir}/libappindicator3.so.%{sover}* %files -n typelib-1_0-AppIndicator3-0_1 %defattr(-,root,root) diff --git a/libappindicator_12.10.1+15.04.20141110.orig.tar.gz b/libappindicator_12.10.1+15.04.20141110.orig.tar.gz deleted file mode 100644 index aa87cbd..0000000 --- a/libappindicator_12.10.1+15.04.20141110.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:627a0f2a9c916ebc8256ef388073a24f40f70c2b5e8c6a510b6853a4e1abe725 -size 69485 diff --git a/libappindicator_12.10.1+17.04.20170215.orig.tar.gz b/libappindicator_12.10.1+17.04.20170215.orig.tar.gz new file mode 100644 index 0000000..b6c7702 --- /dev/null +++ b/libappindicator_12.10.1+17.04.20170215.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1db7df6c5da6b64e7d016ac2adefb0519c8944ef2b32be4c64c55cc849a0577e +size 71240