diff --git a/libdbusmenu.changes b/libdbusmenu.changes index fefae2a..149d9ee 100644 --- a/libdbusmenu.changes +++ b/libdbusmenu.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue May 5 13:47:23 UTC 2015 - sor.alexei@meowr.ru + +- Update to 12.10.3+bzr20150410 (changes since 12.10.3+bzr20140610): + * Use the configure-generated libtool script instead of + /usr/bin/libtool, which might not match what we have. + * Use gi's typelibdir pkgconfig variable and install into this + directory, now that gi supports multiarch. + * Parser: don't override the label for stock items if a custom + one is provided. +- Minor spec cleanup. + +------------------------------------------------------------------- +Sun Oct 26 13:19:05 UTC 2014 - p.drouand@gmail.com + +- Update to version 12.10.3+14.10.20140610 + + No changelog available + ------------------------------------------------------------------- Mon Mar 10 20:06:16 UTC 2014 - cfarrell@suse.com diff --git a/libdbusmenu.spec b/libdbusmenu.spec index f93e129..224a7d8 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,25 +16,23 @@ # -%define _soname_glib 4 -%define _soname_gtk2 4 -%define _soname_gtk3 4 -%define _soname_jsonloader 4 - +%define soname_glib 4 +%define soname_gtk2 4 +%define soname_gtk3 4 +%define soname_jsonloader 4 +%define _version 12.10.3+15.04.20150410.2 Name: libdbusmenu -Version: 12.10.3+14.04.20140217.1 +Version: 12.10.3+bzr20150410 Release: 0 Summary: Small library that passes a menu structure across DBus License: GPL-3.0 and (LGPL-2.1 or LGPL-3.0) Group: System/Libraries Url: https://launchpad.net/dbusmenu -Source: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu/%{name}_%{version}.orig.tar.gz +Source: http://archive.ubuntu.com/ubuntu/pool/main/libd/%{name}/%{name}_%{_version}.orig.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: gnome-common BuildRequires: gtk-doc -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig @@ -44,125 +42,114 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(x11) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A small little library that was created by pulling out some comon code out of -indicator-applet. It passes a menu structure across DBus so that a program can -create a menu simply without worrying about how it is displayed on the other -side of the bus. - +A small little library that was created by pulling out some common +code out of mate-indicator-applet. It passes a menu structure +across D-Bus so that a program can create a menu simply without +worrying about how it is displayed on the other side of the bus. %package tools Summary: Development tools for the dbusmenu libraries Group: Development/Tools/Other -Requires: %{name}-glib%{_soname_glib} = %{version} +Requires: %{name}-glib%{soname_glib} = %{version} %description tools This packages contains the development tools for the dbusmenu libraries. - -%package glib%{_soname_glib} -Summary: Small library that passes a menu structure across DBus +%package glib%{soname_glib} +Summary: Small library that passes a menu structure across D-Bus Group: System/Libraries -%description glib%{_soname_glib} +%description glib%{soname_glib} This package contains the shared libraries for the dbusmenu-glib library. - %package -n typelib-1_0-Dbusmenu-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Dbusmenu-0_4 This package contains the GObject Introspection bindings for the dbusmenu library. - %package glib-devel Summary: Development files for libdbusmenu-glib Group: Development/Libraries/C and C++ -Requires: %{name}-glib%{_soname_glib} = %{version} -Requires: gtk2-devel +Requires: %{name}-glib%{soname_glib} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-2.0) %description glib-devel This package contains the development files for the dbusmenu-glib library. - %package glib-doc -Summary: Documentation for libdbusmenu-glib%{_soname_glib} +Summary: Documentation for libdbusmenu-glib%{soname_glib} Group: Documentation/HTML BuildArch: noarch %description glib-doc This package includes the documentation for the dbusmenu-glib library. - -%package gtk%{_soname_gtk2} -Summary: Small library that passes a menu structure across DBus - GTK2 version +%package gtk%{soname_gtk2} +Summary: Small library that passes a menu structure across D-Bus -- GTK+ 2 version Group: System/Libraries Requires: gtk2 -%description gtk%{_soname_gtk2} +%description gtk%{soname_gtk2} This package contains the shared libraries for the dbusmenu-gtk2 library. - %package -n typelib-1_0-DbusmenuGtk-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-DbusmenuGtk-0_4 -This package contains the GObject Introspection bindings for the GTK 2 version +This package contains the GObject Introspection bindings for the GTK+ 2 version of the dbusmenu-gtk library. - %package gtk-devel -Summary: Development files for libdbusmenu-gtk%{_soname_gtk2} +Summary: Development files for libdbusmenu-gtk%{soname_gtk2} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk%{_soname_gtk2} = %{version} -Requires: gtk2-devel +Requires: %{name}-gtk%{soname_gtk2} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-2.0) %description gtk-devel This package contains the development files for the dbusmenu-gtk2 library. - -%package gtk3-%{_soname_gtk3} -Summary: Small library that passes a menu structure across DBus - GTK3 version +%package gtk3-%{soname_gtk3} +Summary: Small library that passes a menu structure across DBus -- GTK+ 3 version Group: System/Libraries -%description gtk3-%{_soname_gtk3} +%description gtk3-%{soname_gtk3} This package contains the shared libraries for the dbusmenu-gtk3 library. - %package -n typelib-1_0-DbusmenuGtk3-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-DbusmenuGtk3-0_4 -This package contains the GObject Introspection bindings for the GTK 3 version +This package contains the GObject Introspection bindings for the GTK+ 3 version of the dbusmenu-gtk library. - %package gtk3-devel -Summary: Development files for libdbusmenu-gtk3-%{_soname_gtk3} +Summary: Development files for libdbusmenu-gtk3-%{soname_gtk3} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk3-%{_soname_gtk3} = %{version} -Requires: gtk3-devel +Requires: %{name}-gtk3-%{soname_gtk3} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-3.0) %description gtk3-devel This package contains the development files for the dbusmenu-gtk3 library. - %package gtk-doc -Summary: Documentation for libdbusmenu-gtk%{_soname_gtk2} and libdbusmenu-gtk3-%{_soname_gtk3} +Summary: Documentation for libdbusmenu-gtk%{soname_gtk2} and libdbusmenu-gtk3-%{soname_gtk3} Group: Documentation/HTML BuildArch: noarch @@ -170,90 +157,83 @@ BuildArch: noarch This package contains the documentation for the dbusmenu-gtk2 and dbusmenu-gtk3 libraries. - -%package jsonloader%{_soname_jsonloader} -Summary: Small library that passes a menu structure across DBus - Test library +%package jsonloader%{soname_jsonloader} +Summary: Small library that passes a menu structure across DBus -- Test library Group: System/Libraries -%description jsonloader%{_soname_jsonloader} +%description jsonloader%{soname_jsonloader} This package contains the shared libraries for dbusmenu-jsonloader, a library meant for test suites. - %package jsonloader-devel -Summary: Development files for libdbusmenu-jsonloader%{_soname_jsonloader} +Summary: Development files for libdbusmenu-jsonloader%{soname_jsonloader} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-jsonloader%{_soname_jsonloader} = %{version} +Requires: %{name}-jsonloader%{soname_jsonloader} = %{version} Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(json-glib-1.0) %description jsonloader-devel This package contains the development files for the dbusmenu-jsonloader library. - %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{_version} %build + %global _configure ../configure -NOCONFIGURE=1 sh autogen.sh -export V=1 -mkdir -p build-gtk2 build-gtk3 - -pushd build-gtk2 -%configure --disable-scrollkeeper --enable-gtk-doc --enable-introspection \ - --with-gtk=2 --disable-static -make %{?_smp_mflags} -popd - -pushd build-gtk3 -%configure --disable-scrollkeeper --enable-gtk-doc --enable-introspection \ - --with-gtk=3 --disable-static -make %{?_smp_mflags} -popd +NOCONFIGURE=1 ./autogen.sh +for ver in 2 3; do + mkdir build-gtk$ver + pushd build-gtk$ver + %configure \ + --disable-static \ + --disable-scrollkeeper \ + --enable-gtk-doc \ + --enable-introspection \ + --with-gtk=$ver + make %{?_smp_mflags} + popd +done %install -pushd build-gtk2 -%make_install -popd +for ver in 2 3; do + pushd build-gtk$ver + %make_install + popd +done -pushd build-gtk3 -%make_install -popd +find %{buildroot} -type f -name "*.la" -delete -print -# Remove libtool files -find %{buildroot} -type f -name '*.la' -delete +# Put documentation in correct directory. +mkdir -p %{buildroot}%{_docdir}/%{name}-tools/ +mv -f %{buildroot}%{_datadir}/doc/%{name}/README.dbusmenu-bench \ + %{buildroot}%{_docdir}/%{name}-tools/ -# Put documentation in correct directory -install -dm755 %{buildroot}%{_docdir}/%{name}-tools/ -mv %{buildroot}%{_datadir}/doc/%{name}/README.dbusmenu-bench \ - %{buildroot}%{_docdir}/%{name}-tools/ +# Put examples in correct documentation directory. +mkdir -p %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ +mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ + %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ -# Put examples in correct documentation directory -install -dm755 %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ -mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ - %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ +%post glib%{soname_glib} -p /sbin/ldconfig -%post glib%{_soname_glib} -p /sbin/ldconfig +%postun glib%{soname_glib} -p /sbin/ldconfig -%postun glib%{_soname_glib} -p /sbin/ldconfig +%post gtk%{soname_gtk2} -p /sbin/ldconfig -%post gtk%{_soname_gtk2} -p /sbin/ldconfig +%postun gtk%{soname_gtk2} -p /sbin/ldconfig -%postun gtk%{_soname_gtk2} -p /sbin/ldconfig +%post gtk3-%{soname_gtk3} -p /sbin/ldconfig -%post gtk3-%{_soname_gtk3} -p /sbin/ldconfig +%postun gtk3-%{soname_gtk3} -p /sbin/ldconfig -%postun gtk3-%{_soname_gtk3} -p /sbin/ldconfig +%post jsonloader%{soname_jsonloader} -p /sbin/ldconfig -%post jsonloader%{_soname_jsonloader} -p /sbin/ldconfig - -%postun jsonloader%{_soname_jsonloader} -p /sbin/ldconfig +%postun jsonloader%{soname_jsonloader} -p /sbin/ldconfig %files tools %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-dumper %{_libexecdir}/dbusmenu-testapp @@ -263,19 +243,19 @@ mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ %doc %dir %{_docdir}/%{name}-tools/ %doc %{_docdir}/%{name}-tools/README.dbusmenu-bench -%files glib%{_soname_glib} +%files glib%{soname_glib} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-glib.so.%{_soname_glib}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-glib.so.%{soname_glib}* %files -n typelib-1_0-Dbusmenu-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib %files glib-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/client.h @@ -296,22 +276,22 @@ mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ %files glib-doc %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-glib/ -%files gtk%{_soname_gtk2} +%files gtk%{soname_gtk2} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-gtk.so.%{_soname_gtk2}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-gtk.so.%{soname_gtk2}* %files -n typelib-1_0-DbusmenuGtk-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib %files gtk-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-gtk-0.4/ %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h @@ -325,19 +305,19 @@ mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi -%files gtk3-%{_soname_gtk3} +%files gtk3-%{soname_gtk3} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-gtk3.so.%{_soname_gtk3}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-gtk3.so.%{soname_gtk3}* %files -n typelib-1_0-DbusmenuGtk3-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib %files gtk3-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-gtk3-0.4/ %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/client.h @@ -353,17 +333,17 @@ mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ %files gtk-doc %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-gtk/ -%files jsonloader%{_soname_jsonloader} +%files jsonloader%{soname_jsonloader} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-jsonloader.so.%{_soname_jsonloader}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-jsonloader.so.%{soname_jsonloader}* %files jsonloader-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/json-loader.h diff --git a/libdbusmenu_12.10.3+14.04.20140217.1.orig.tar.gz b/libdbusmenu_12.10.3+14.04.20140217.1.orig.tar.gz deleted file mode 100644 index 38d54b2..0000000 --- a/libdbusmenu_12.10.3+14.04.20140217.1.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4ce24179f398cf7c55727bd68d3d93f5f9ac8b7601651cab067923d41aec701 -size 2367871 diff --git a/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz b/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz new file mode 100644 index 0000000..9542064 --- /dev/null +++ b/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cc6eebd2b706275d2882fe345837c629a069179c7fb91b39fff11fd1531fc68 +size 2368887