commit 44381780aae06ebc15035fe4cef0759a9b7f1ae7
Author: Marcin Banasiak <marcin.banas...@gmail.com>
Date: Wed Apr 4 22:00:13 2018 +0200
Update to 3.28.0
- added -gtkdocdir patch to fix apidocs install dir
gnome-bluetooth-gtkdocdir.patch | 11 +++++++++++
gnome-bluetooth.spec | 39 +++++++++++----------------------------
2 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index cbcea7b..bd2907f 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,28 +1,25 @@
Summary: GNOME Bluetooth Subsystem
Summary(pl.UTF-8): Podsystem GNOME Bluetooth
Name: gnome-bluetooth
-Version: 3.20.1
+Version: 3.28.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.20/%{name}-%{version}.tar.xz
-# Source0-md5: 0768931f17eaba8b05eddacf17204f60
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.28/%{name}-%{version}.tar.xz
+# Source0-md5: 75ec82570d0baf18b6cbff86c2712e87
Source1: 61-%{name}-rfkill.rules
+Patch0: %{name}-gtkdocdir.patch
URL: http://live.gnome.org/GnomeBluetooth
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake >= 1:1.11.2
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools >= 0.17
BuildRequires: glib2-devel >= 1:2.38.0
-BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk+3-devel >= 3.12.0
BuildRequires: gtk-doc >= 1.9
-BuildRequires: intltool >= 0.40.0
BuildRequires: libcanberra-gtk3-devel
BuildRequires: libnotify-devel >= 0.7.0
-BuildRequires: libtool
BuildRequires: libxml2-progs
+BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.592
BuildRequires: udev-devel
@@ -110,35 +107,21 @@ Dokumentacja API biblioteki GNOME Bluetooth.
%prep
%setup -q
+%patch0 -p1
%build
-%{__gtkdocize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-desktop-update \
- --disable-icon-update \
- --enable-introspection \
- --disable-schemas-compile \
- --disable-silent-rules \
- --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+ -Dgtk_doc=true
+%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/lib/udev/rules.d
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
cp -p %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la
-
%find_lang %{name} --with-gnome --with-omf --all-name
%clean
@@ -157,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog* NEWS README
%attr(755,root,root) %{_bindir}/bluetooth-sendto
%{_desktopdir}/bluetooth-sendto.desktop
%{_datadir}/gnome-bluetooth
diff --git a/gnome-bluetooth-gtkdocdir.patch b/gnome-bluetooth-gtkdocdir.patch
new file mode 100644
index 0000000..5928f37
--- /dev/null
+++ b/gnome-bluetooth-gtkdocdir.patch
@@ -0,0 +1,11 @@
+---
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/44381780aae06ebc15035fe4cef0759a9b7f1ae7
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
