[packages/almanah] - updated to 0.12.4
qboosh
qboosh at pld-linux.org
Fri Mar 14 07:53:53 CET 2025
commit f1d0190d43ee2cfbf2b0cf00c44f58c318cc0fdf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 14 06:33:39 2025 +0100
- updated to 0.12.4
almanah-meson.patch | 17 -----------------
almanah.spec | 47 ++++++++++++++++++++++-------------------------
2 files changed, 22 insertions(+), 42 deletions(-)
---
diff --git a/almanah.spec b/almanah.spec
index e6d41da..f3f7b80 100644
--- a/almanah.spec
+++ b/almanah.spec
@@ -6,38 +6,37 @@
Summary: Almanah Diary - keep a personal diary
Summary(pl.UTF-8): Almanah Diary - osobisty pamiętnik
Name: almanah
-Version: 0.12.3
-Release: 5
+Version: 0.12.4
+Release: 1
License: GPL v3+
Group: X11/Applications
Source0: https://download.gnome.org/sources/almanah/0.12/%{name}-%{version}.tar.xz
-# Source0-md5: b4d6023342f49e23435e06fd54d7fa4c
-Patch0: %{name}-meson.patch
+# Source0-md5: b5d0e39c4f45bf8adfb53bd44461871c
URL: https://wiki.gnome.org/Apps/Almanah_Diary
-BuildRequires: appstream-glib
+BuildRequires: AppStream
BuildRequires: atk-devel
BuildRequires: cairo-devel
%{?with_evolution:BuildRequires: evolution-data-server-devel >= 3.33.2}
BuildRequires: gettext-tools
-BuildRequires: gcr-devel >= 3
-BuildRequires: glib2-devel >= 1:2.32
+BuildRequires: gcr4-devel >= 4
+BuildRequires: glib2-devel >= 1:2.68
BuildRequires: gpgme-devel >= 1.0.0
BuildRequires: gtk+3-devel >= 3.15
-BuildRequires: gtksourceview3-devel >= 3.0
+BuildRequires: gtksourceview4-devel >= 4.0
%{?with_gtkspell:BuildRequires: gtkspell3-devel >= 3.0}
BuildRequires: libcryptui-devel
-BuildRequires: meson >= 0.51
+BuildRequires: meson >= 0.59
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
BuildRequires: python3 >= 1:3
-BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: rpmbuild(macros) >= 2.042
BuildRequires: sqlite3-devel >= 3
BuildRequires: tar >= 1:1.22
BuildRequires: xz
Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): glib2 >= 1:2.32
+Requires(post,postun): glib2 >= 1:2.68
%{?with_evolution:Requires: evolution-data-server >= 3.33.2}
-Requires: glib2 >= 1:2.32
+Requires: glib2 >= 1:2.68
Requires: gpgme >= 1.0.0
Requires: gtk+3 >= 3.15
Requires: hicolor-icon-theme
@@ -53,19 +52,18 @@ pamiętnik.
%prep
%setup -q
-%patch -P0 -p1
%build
-%meson build \
- %{!?with_evolution:-Devolution=false} \
- %{!?with_gtkspell:-Dspell_checking=false}
+%meson \
+ %{!?with_evolution:-Devolution=disabled} \
+ %{!?with_gtkspell:-Dspell_checking=disabled}
-%ninja_build -C build
+%meson_build
%install
rm -rf $RPM_BUILD_ROOT
-%ninja_install -C build
+%meson_install
%find_lang %{name}
@@ -82,12 +80,11 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS README.md
+%doc AUTHORS MAINTAINERS NEWS.md README.md
%attr(755,root,root) %{_bindir}/almanah
-%{_datadir}/GConf/gsettings/almanah.convert
%{_datadir}/glib-2.0/schemas/org.gnome.almanah.gschema.xml
-%{_datadir}/metainfo/almanah.appdata.xml
-%{_desktopdir}/almanah.desktop
-%{_iconsdir}/hicolor/*x*/apps/almanah.png
-%{_iconsdir}/hicolor/scalable/actions/almanah-tags-symbolic.svg
-%{_iconsdir}/hicolor/scalable/apps/almanah-symbolic.svg
+%{_datadir}/metainfo/org.gnome.Almanah.metainfo.xml
+%{_desktopdir}/org.gnome.Almanah.desktop
+%{_iconsdir}/hicolor/*x*/apps/org.gnome.Almanah.png
+%{_iconsdir}/hicolor/scalable/actions/org.gnome.Almanah-tags-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Almanah-symbolic.svg
diff --git a/almanah-meson.patch b/almanah-meson.patch
deleted file mode 100644
index cd0a4d8..0000000
--- a/almanah-meson.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- almanah-0.12.3/data/meson.build.orig 2021-03-05 16:05:46.935089000 +0100
-+++ almanah-0.12.3/data/meson.build 2023-05-30 22:14:56.161300753 +0200
-@@ -1,6 +1,5 @@
- desktop = 'almanah.desktop'
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
-@@ -19,7 +18,6 @@ endif
-
- appdata = 'almanah.appdata.xml'
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/almanah.git/commitdiff/f1d0190d43ee2cfbf2b0cf00c44f58c318cc0fdf
More information about the pld-cvs-commit
mailing list