commit bcd536bdab6b9da76dc64b40d4451c281e2376e0
Author: Jakub Bogusz <[email protected]>
Date: Sun May 19 21:40:29 2019 +0200
- updated to 3.32.1
- removed obsolete gtkdocdir patch
gnome-bluetooth-gtkdocdir.patch | 11 -----------
gnome-bluetooth.spec | 42 ++++++++++++++---------------------------
2 files changed, 14 insertions(+), 39 deletions(-)
---
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 72df3a4..46fa9ba 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,15 +1,14 @@
Summary: GNOME Bluetooth Subsystem
Summary(pl.UTF-8): Podsystem GNOME Bluetooth
Name: gnome-bluetooth
-Version: 3.28.2
+Version: 3.32.1
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.28/%{name}-%{version}.tar.xz
-# Source0-md5: eff705fadd5e0bb44a087d10fcbe34af
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.32/%{name}-%{version}.tar.xz
+# Source0-md5: 5b3d66f564a5067ea154750cdb6d850d
Source1: 61-%{name}-rfkill.rules
-Patch0: %{name}-gtkdocdir.patch
-URL: http://live.gnome.org/GnomeBluetooth
+URL: https://wiki.gnome.org/Projects/GnomeBluetooth
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools >= 0.17
BuildRequires: glib2-devel >= 1:2.38.0
@@ -19,12 +18,11 @@ BuildRequires: gtk-doc >= 1.9
BuildRequires: libcanberra-gtk3-devel
BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: libxml2-progs
-BuildRequires: meson >= 0.43.0
+BuildRequires: meson >= 0.49.0
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.727
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: udev-devel
-BuildRequires: xorg-lib-libX11-devel
-BuildRequires: xorg-lib-libXi-devel
Requires(post,postun): glib2 >= 1:2.38.0
Requires(post,postun): gtk-update-icon-cache
Requires: %{name}-libs = %{version}-%{release}
@@ -70,7 +68,7 @@ Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: glib2-devel >= 1:2.38.0
Requires: gtk+3-devel >= 3.12.0
-Requires: udev-devel
+Obsoletes: gnome-bluetooth-static
%description devel
Header files for GNOME Bluetooth subsystem.
@@ -78,19 +76,6 @@ Header files for GNOME Bluetooth subsystem.
%description devel -l pl.UTF-8
Pliki nagłówkowe dla podsystemu GNOME Bluetooth.
-%package static
-Summary: Static GNOME Bluetooth library
-Summary(pl.UTF-8): Statyczna biblioteka GNOME Bluetooth
-License: LGPL v2+
-Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static GNOME Bluetooth library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka GNOME Bluetooth.
-
%package apidocs
Summary: GNOME Bluetooth library API documentation
Summary(pl.UTF-8): Dokumentacja API biblioteki GNOME Bluetooth
@@ -107,18 +92,17 @@ Dokumentacja API biblioteki GNOME Bluetooth.
%prep
%setup -q
-%patch0 -p1
%build
%meson build \
-Dgtk_doc=true
-%meson_build -C build
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/lib/udev/rules.d
-%meson_install -C build
+%ninja_install -C build
cp -p %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d
@@ -144,8 +128,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/bluetooth-sendto
%{_desktopdir}/bluetooth-sendto.desktop
%{_datadir}/gnome-bluetooth
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
+%{_iconsdir}/hicolor/*x*/apps/bluetooth.png
+%{_iconsdir}/hicolor/*x*/status/bluetooth-*.png
+%{_iconsdir}/hicolor/scalable/apps/bluetooth.svg
+%{_iconsdir}/hicolor/scalable/status/bluetooth-*.svg
%{_mandir}/man1/bluetooth-sendto.1*
/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
diff --git a/gnome-bluetooth-gtkdocdir.patch b/gnome-bluetooth-gtkdocdir.patch
deleted file mode 100644
index 5928f37..0000000
--- a/gnome-bluetooth-gtkdocdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
gnome-bluetooth-3.28.0/docs/reference/libgnome-bluetooth/meson.build.gtkdoc
2018-04-04 21:58:30.171226505 +0200
-+++ gnome-bluetooth-3.28.0/docs/reference/libgnome-bluetooth/meson.build
2018-04-04 21:58:38.234354561 +0200
-@@ -20,7 +20,7 @@ configure_file(
- configuration: version_conf
- )
-
--doc_path = join_paths(gnomebt_datadir, 'gtk-doc', 'html',
meson.project_name())
-+doc_path = join_paths(gnomebt_datadir, 'doc', 'gtk-doc', 'html',
meson.project_name())
-
- gnome.gtkdoc(
- meson.project_name(),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-bluetooth.git/commitdiff/bcd536bdab6b9da76dc64b40d4451c281e2376e0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
