Hello community, here is the log from the commit of package libappindicator for openSUSE:Factory checked in at 2015-06-16 14:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libappindicator (Old) and /work/SRC/openSUSE:Factory/.libappindicator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libappindicator" Changes: -------- --- /work/SRC/openSUSE:Factory/libappindicator/libappindicator.changes 2015-03-11 09:58:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libappindicator.new/libappindicator.changes 2015-06-16 14:05:26.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 5 13:47:23 UTC 2015 - sor.ale...@meowr.ru + +- Update to 12.10.1+bzr20141110: + * scroll-event: change parameter to the right type. +- Rebase 0001_Fix_mono_dir.patch. +- Remove no-deprecated.patch: merged upstream. +- Remove dont-build-examples.patch: fixed upstream. +- Minor spec cleanup. + +------------------------------------------------------------------- Old: ---- dont-build-examples.patch libappindicator_12.10.1+13.10.20130920.orig.tar.gz no-deprecated.patch New: ---- libappindicator_12.10.1+15.04.20141110.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libappindicator.spec ++++++ --- /var/tmp/diff_new_pack.8QFhx3/_old 2015-06-16 14:05:28.000000000 +0200 +++ /var/tmp/diff_new_pack.8QFhx3/_new 2015-06-16 14:05:28.000000000 +0200 @@ -16,49 +16,43 @@ # -%define _soname 1 +%define soname 1 +%define _version 12.10.1+15.04.20141110 %bcond_without mono Name: libappindicator -Version: 12.10.1+13.10.20130920 +Version: 12.10.1+bzr20141110 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: %{name}_%{version}.orig.tar.gz -# PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch -- fix location of .pc files +Source: http://archive.ubuntu.com/ubuntu/pool/main/liba/%{name}/%{name}_%{_version}.orig.tar.gz +# PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch hrvoje.sen...@gmail.com -- Fix location of .pc files. Patch0: 0001_Fix_mono_dir.patch -# PATCH-FIX-UPSTREAM dont-build-examples.patch -- don't build examples -Patch1: dont-build-examples.patch -# PATCH-FIX-UPSTREAM no-deprecated.patch -- don't fail on deprecated declarations -Patch2: no-deprecated.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc -BuildRequires: libtool BuildRequires: vala BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbusmenu-glib-0.4) BuildRequires: pkgconfig(dbusmenu-gtk-0.4) BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) -%if %{with mono} -BuildRequires: pkgconfig(gapi-2.0) -%endif BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(indicator-0.4) +BuildRequires: pkgconfig(indicator3-0.4) +BuildRequires: pkgconfig(pygtk-2.0) +%if %{with mono} +BuildRequires: pkgconfig(gapi-2.0) +%endif %if %{with mono} BuildRequires: pkgconfig(gtk-sharp-2.0) %endif -BuildRequires: pkgconfig(indicator-0.4) -BuildRequires: pkgconfig(indicator3-0.4) %if %{with mono} BuildRequires: pkgconfig(mono) BuildRequires: pkgconfig(mono-nunit) %endif -BuildRequires: pkgconfig(pygtk-2.0) %description A library to allow applications to export a menu into the Unity Menu bar. Based @@ -68,16 +62,16 @@ %package -n python-appindicator Summary: Python 2 bindings for libappindicator Group: System/Libraries -Requires: %{name}%{_soname} = %{version} +Requires: libappindicator%{soname} = %{version} %description -n python-appindicator This package contains the Python 2 bindings for the appindicator library. -%package -n libappindicator%{_soname} +%package -n libappindicator%{soname} Summary: Application indicators library Group: System/Libraries -%description -n libappindicator%{_soname} +%description -n libappindicator%{soname} 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. @@ -93,18 +87,18 @@ %package devel Summary: Development files for libappindicator Group: Development/Libraries/C and C++ -Requires: libappindicator%{_soname} = %{version} +Requires: libappindicator%{soname} = %{version} Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(dbusmenu-glib-0.4) %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-%{soname} +Summary: Application indicators library -- GTK+ 3 Group: System/Libraries -%description -n libappindicator3-%{_soname} +%description -n libappindicator3-%{soname} 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. @@ -120,9 +114,9 @@ library. %package -n libappindicator3-devel -Summary: Development files for libappindicator3-%{_soname} +Summary: Development files for libappindicator3-%{soname} Group: Development/Libraries/C and C++ -Requires: libappindicator3-%{_soname} = %{version} +Requires: libappindicator3-%{soname} = %{version} Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(dbusmenu-glib-0.4) @@ -139,7 +133,7 @@ libraries. %package -n appindicator-sharp -Summary: Application indicators library - C# assembly CLI +Summary: Application indicators library -- C# assembly CLI Group: System/Libraries %description -n appindicator-sharp @@ -157,52 +151,45 @@ This package contains the development files for the appindicator-sharp library. %prep -%setup -q +%setup -q -n %{name}-%{_version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %global _configure ../configure -NOCONFIGURE=1 sh autogen.sh -export V=1 -mkdir build-gtk2 build-gtk3 - -pushd build-gtk2 -%configure --with-gtk=2 --enable-gtk-doc --disable-static --disable-mono-test -make -j1 -popd - -pushd build-gtk3 -%configure --with-gtk=3 --enable-gtk-doc --disable-static --disable-mono-test -make -j1 -popd +NOCONFIGURE=1 ./autogen.sh -%install -pushd build-gtk2 -%make_install -popd - -pushd build-gtk3 -%make_install -popd +for ver in 2 3; do + mkdir build-gtk$ver + pushd build-gtk$ver + %configure \ + --disable-static \ + --enable-gtk-doc \ + --disable-mono-test \ + --with-gtk=$ver + make -j1 + popd +done -# Remove libtool archives +%install +for ver in 2 3; do + pushd build-gtk$ver + %make_install + popd +done find %{buildroot} -type f -name "*.la" -delete -print +%fdupes %{buildroot}%{python_sitearch} -%fdupes %{buildroot}%{python_sitearch}/appindicator/ - -%post -n libappindicator%{_soname} -p /sbin/ldconfig +%post -n libappindicator%{soname} -p /sbin/ldconfig -%postun -n libappindicator%{_soname} -p /sbin/ldconfig +%postun -n libappindicator%{soname} -p /sbin/ldconfig -%post -n libappindicator3-%{_soname} -p /sbin/ldconfig +%post -n libappindicator3-%{soname} -p /sbin/ldconfig -%postun -n libappindicator3-%{_soname} -p /sbin/ldconfig +%postun -n libappindicator3-%{soname} -p /sbin/ldconfig %files -n python-appindicator %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %dir %{python_sitearch}/appindicator/ %{python_sitearch}/appindicator/__init__.py* %{python_sitearch}/appindicator/_appindicator.so @@ -211,19 +198,19 @@ %dir %{_datadir}/pygtk/2.0/defs/ %{_datadir}/pygtk/2.0/defs/appindicator.defs -%files -n libappindicator%{_soname} +%files -n libappindicator%{soname} %defattr(-,root,root) -%doc COPYING* -%{_libdir}/libappindicator.so.%{_soname}* +%doc COPYING COPYING.LGPL.2.1 README +%{_libdir}/libappindicator.so.%{soname}* %files -n typelib-1_0-AppIndicator-0_1 %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %{_libdir}/girepository-1.0/AppIndicator-0.1.typelib %files devel %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %dir %{_includedir}/libappindicator-0.1/ %dir %{_includedir}/libappindicator-0.1/libappindicator/ %{_includedir}/libappindicator-0.1/libappindicator/*.h @@ -233,19 +220,19 @@ %{_datadir}/vala/vapi/appindicator-0.1.vapi %{_datadir}/vala/vapi/appindicator-0.1.deps -%files -n libappindicator3-%{_soname} +%files -n libappindicator3-%{soname} %defattr(-,root,root) -%doc COPYING* -%{_libdir}/libappindicator3.so.%{_soname}* +%doc COPYING COPYING.LGPL.2.1 README +%{_libdir}/libappindicator3.so.%{soname}* %files -n typelib-1_0-AppIndicator3-0_1 %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %{_libdir}/girepository-1.0/AppIndicator3-0.1.typelib %files -n libappindicator3-devel %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %dir %{_includedir}/libappindicator3-0.1/ %dir %{_includedir}/libappindicator3-0.1/libappindicator/ %{_includedir}/libappindicator3-0.1/libappindicator/*.h @@ -257,13 +244,13 @@ %files doc %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %doc %{_datadir}/gtk-doc/html/libappindicator/ %if %{with mono} %files -n appindicator-sharp %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %dir %{_libdir}/appindicator-sharp-0.1/ %{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll %{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll.config @@ -285,7 +272,7 @@ %files -n appindicator-sharp-devel %defattr(-,root,root) -%doc COPYING* +%doc COPYING COPYING.LGPL.2.1 README %{_libdir}/pkgconfig/appindicator-sharp-0.1.pc %endif ++++++ 0001_Fix_mono_dir.patch ++++++ --- /var/tmp/diff_new_pack.8QFhx3/_old 2015-06-16 14:05:28.000000000 +0200 +++ /var/tmp/diff_new_pack.8QFhx3/_new 2015-06-16 14:05:28.000000000 +0200 @@ -1,27 +1,24 @@ -Index: libappindicator-14.04.bzr20131219/bindings/mono/appindicator-sharp-0.1.pc.in -=================================================================== ---- libappindicator-14.04.bzr20131219.orig/bindings/mono/appindicator-sharp-0.1.pc.in -+++ libappindicator-14.04.bzr20131219/bindings/mono/appindicator-sharp-0.1.pc.in +diff -aur a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in +--- a/bindings/mono/appindicator-sharp-0.1.pc.in ++++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1 +assemblies_dir=${libdir}/appindicator-sharp-0.1 - + Name: appindicator-sharp Description: application indicators for .NET -Index: libappindicator-14.04.bzr20131219/bindings/mono/Makefile.am -=================================================================== ---- libappindicator-14.04.bzr20131219.orig/bindings/mono/Makefile.am -+++ libappindicator-14.04.bzr20131219/bindings/mono/Makefile.am -@@ -31,7 +31,7 @@ TARGET = \ +diff -aur a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am +--- a/bindings/mono/Makefile.am ++++ b/bindings/mono/Makefile.am +@@ -31,7 +31,7 @@ $(DLLPOLICY1) \ $(POLICY1).config - + -assemblydir = $(libdir)/cli/appindicator-sharp-0.1 +assemblydir = $(libdir)/appindicator-sharp-0.1 assembly_DATA = $(TARGET) - + CLEANFILES = \ - ++++++ libappindicator_12.10.1+13.10.20130920.orig.tar.gz -> libappindicator_12.10.1+15.04.20141110.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libappindicator-12.10.1+13.10.20130920/Makefile.am new/libappindicator-12.10.1+15.04.20141110/Makefile.am --- old/libappindicator-12.10.1+13.10.20130920/Makefile.am 2013-09-20 12:15:14.000000000 +0200 +++ new/libappindicator-12.10.1+15.04.20141110/Makefile.am 2014-11-10 17:29:35.000000000 +0100 @@ -3,9 +3,11 @@ SUBDIRS = \ src \ bindings \ - example \ docs +# FIXME: Disabled, vala error +# example + if WANT_TESTS SUBDIRS += tests endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libappindicator-12.10.1+13.10.20130920/m4/gcov.m4 new/libappindicator-12.10.1+15.04.20141110/m4/gcov.m4 --- old/libappindicator-12.10.1+13.10.20130920/m4/gcov.m4 2013-09-20 12:15:14.000000000 +0200 +++ new/libappindicator-12.10.1+15.04.20141110/m4/gcov.m4 2014-11-10 17:29:51.000000000 +0100 @@ -30,7 +30,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" AC_CHECK_PROG(LCOV, lcov, lcov) AC_CHECK_PROG(GENHTML, genhtml, genhtml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libappindicator-12.10.1+13.10.20130920/src/Makefile.am new/libappindicator-12.10.1+15.04.20141110/src/Makefile.am --- old/libappindicator-12.10.1+13.10.20130920/src/Makefile.am 2013-09-20 12:15:14.000000000 +0200 +++ new/libappindicator-12.10.1+15.04.20141110/src/Makefile.am 2014-11-10 17:29:35.000000000 +0100 @@ -76,7 +76,7 @@ libappindicator_la_CFLAGS = \ $(LIBRARY_CFLAGS) \ $(COVERAGE_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libappindicator-12.10.1+13.10.20130920/src/app-indicator.c new/libappindicator-12.10.1+15.04.20141110/src/app-indicator.c --- old/libappindicator-12.10.1+13.10.20130920/src/app-indicator.c 2013-09-20 12:15:14.000000000 +0200 +++ new/libappindicator-12.10.1+15.04.20141110/src/app-indicator.c 2014-11-10 17:29:51.000000000 +0100 @@ -526,7 +526,7 @@ * AppIndicator::scroll-event: * @arg0: The #AppIndicator object * @arg1: How many steps the scroll wheel has taken - * @arg2: (type Gdk.ScrollDirection) Which direction the wheel went in + * @arg2: (type Gdk.ScrollDirection): Which direction the wheel went in * * Signaled when the #AppIndicator receives a scroll event. */ @@ -536,7 +536,7 @@ G_STRUCT_OFFSET (AppIndicatorClass, scroll_event), NULL, NULL, _application_service_marshal_VOID__INT_UINT, - G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_UINT); + G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION); /* DBus interfaces */ if (item_node_info == NULL) { @@ -1064,7 +1064,7 @@ GVariant * retval = NULL; if (g_strcmp0(method, "Scroll") == 0) { - guint direction; + GdkScrollDirection direction; gint delta; const gchar *orientation; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libappindicator-12.10.1+13.10.20130920/tests/Makefile.am new/libappindicator-12.10.1+15.04.20141110/tests/Makefile.am --- old/libappindicator-12.10.1+13.10.20130920/tests/Makefile.am 2013-09-20 12:15:14.000000000 +0200 +++ new/libappindicator-12.10.1+15.04.20141110/tests/Makefile.am 2014-11-10 17:29:35.000000000 +0100 @@ -32,7 +32,7 @@ test_libappindicator_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -DSRCDIR="\"$(srcdir)\"" \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ @@ -49,7 +49,7 @@ test_libappindicator_dbus_client_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ @@ -66,7 +66,7 @@ test_libappindicator_dbus_server_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ @@ -83,7 +83,7 @@ test_libappindicator_status_client_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ @@ -100,7 +100,7 @@ test_libappindicator_status_server_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ @@ -116,7 +116,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ @@ -128,7 +128,7 @@ test_libappindicator_fallback_item_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ @@ -198,7 +198,7 @@ test_simple_app_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_simple_app_LDADD = \
