From 240b5dc8bb73cd2467288bebcfb1837e82cdb92d Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Tue, 20 Mar 2018 20:41:24 +0100 Subject: [PATCH] Update to 3.28.0 - removed obsolete -localedir and tracker2 patches --- bijiben-localedir.patch | 22 -------------------- bijiben.spec | 46 ++++++++++++++--------------------------- tracker2.patch | 11 ---------- 3 files changed, 15 insertions(+), 64 deletions(-) delete mode 100644 bijiben-localedir.patch delete mode 100644 tracker2.patch diff --git a/bijiben-localedir.patch b/bijiben-localedir.patch deleted file mode 100644 index c9904c5..0000000 --- a/bijiben-localedir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- bijiben-3.24.0/src/Makefile.am.orig 2017-05-25 02:15:49.000000000 +0200 -+++ bijiben-3.24.0/src/Makefile.am 2017-07-16 09:23:26.593855414 +0200 -@@ -9,7 +9,7 @@ - - AM_CPPFLAGS = \ - -DDATADIR=\""$(datadir)"\" \ -- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -I$(top_srcdir)/libgd \ ---- bijiben-3.24.0/src/libbiji/Makefile.am.orig 2017-05-25 02:15:49.000000000 +0200 -+++ bijiben-3.24.0/src/libbiji/Makefile.am 2017-07-16 09:23:47.530521843 +0200 -@@ -6,7 +6,7 @@ - - AM_CPPFLAGS = \ - -DDATADIR=\""$(datadir)"\" \ -- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -I$(top_srcdir)/libgd \ diff --git a/bijiben.spec b/bijiben.spec index d5c0d3f..e57cda0 100644 --- a/bijiben.spec +++ b/bijiben.spec @@ -1,29 +1,24 @@ Summary: Bijiben - notes editor Summary(pl.UTF-8): Bijiben - edytor notatek Name: bijiben -Version: 3.26.0 -Release: 2 +Version: 3.28.0 +Release: 1 License: GPL v3+ Group: X11/Applications/Editors -Source0: http://ftp.gnome.org/pub/GNOME/sources/bijiben/3.26/%{name}-%{version}.tar.xz -# Source0-md5: 60eed49af9ebe3bee665ca0708d2c91a -Patch0: %{name}-localedir.patch -Patch1: tracker2.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/bijiben/3.28/%{name}-%{version}.tar.xz +# Source0-md5: 55ac14002be56e037d7309e2d424924c URL: https://wiki.gnome.org/Apps/Bijiben BuildRequires: appstream-glib-devel -BuildRequires: autoconf >= 2.50 -BuildRequires: automake BuildRequires: clutter-gtk-devel BuildRequires: evolution-data-server-devel >= 3.13.90 BuildRequires: gettext-tools -BuildRequires: glib2-devel >= 1:2.28 +BuildRequires: glib2-devel >= 1:2.54.0 BuildRequires: gnome-online-accounts-devel -BuildRequires: gtk+3-devel >= 3.11.4 +BuildRequires: gtk+3-devel >= 3.20.0 BuildRequires: gtk-webkit4-devel >= 2.10.0 -BuildRequires: intltool >= 0.50.1 BuildRequires: libxml2-devel >= 2.0 -BuildRequires: libtool >= 2:2 BuildRequires: libuuid-devel +BuildRequires: meson >= 0.43.0 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.592 BuildRequires: sed >= 4.0 @@ -36,8 +31,8 @@ Requires(post,postun): glib2 >= 1:2.28 Requires(post,postun): gtk-update-icon-cache Requires(post,postun): shared-mime-info Requires: evolution-data-server >= 3.13.90 -Requires: glib2 >= 1:2.28 -Requires: gtk+3 >= 3.11.4 +Requires: glib2 >= 1:2.54.0 +Requires: gtk+3 >= 3.20.0 Requires: gtk-webkit4 >= 2.10.0 Requires: hicolor-icon-theme Requires: shared-mime-info @@ -54,27 +49,15 @@ zintegrowanego z pulpitem. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -%{__intltoolize} -%{__libtoolize} -%{__aclocal} -I libgd -%{__autoconf} -%{__autoheader} -%{__automake} -%configure \ - --disable-silent-rules \ - --disable-update-mimedb - -%{__make} +%meson build +%meson_build -C build %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT +%meson_install -C build %find_lang %{name} --with-gnome @@ -93,14 +76,15 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README TODO +%doc AUTHORS NEWS README TODO %attr(755,root,root) %{_bindir}/bijiben %attr(755,root,root) %{_libexecdir}/bijiben-shell-search-provider %{_datadir}/bijiben -%{_datadir}/appdata/org.gnome.bijiben.appdata.xml +%{_datadir}/metainfo/org.gnome.bijiben.appdata.xml %{_desktopdir}/org.gnome.bijiben.desktop %{_datadir}/dbus-1/services/org.gnome.bijiben.SearchProvider.service %{_datadir}/glib-2.0/schemas/org.gnome.bijiben.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.bijiben.enums.xml %{_datadir}/gnome-shell/search-providers/org.gnome.bijiben-search-provider.ini %{_iconsdir}/hicolor/*x*/apps/org.gnome.bijiben.png %{_iconsdir}/hicolor/scalable/apps/org.gnome.bijiben-symbolic.svg diff --git a/tracker2.patch b/tracker2.patch deleted file mode 100644 index 0493aa5..0000000 --- a/tracker2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bijiben-3.26.0/configure.ac~ 2017-09-12 00:29:30.000000000 +0200 -+++ bijiben-3.26.0/configure.ac 2017-11-26 14:36:48.387156229 +0100 -@@ -64,7 +64,7 @@ - WEBKITGTK_REQUIRED_VERSION=2.10.0 - - --PKG_CHECK_MODULES([TRACKER], [tracker-sparql-1.0], [sparql_version="tracker-sparql-1.0"], -+PKG_CHECK_MODULES([TRACKER], [tracker-sparql-2.0], [sparql_version="tracker-sparql-2.0"], - [PKG_CHECK_MODULES([TRACKER], [tracker-sparql-0.18], [sparql_version="tracker-sparql-0.18"]) - ]) - -- 2.44.0