Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eiciel for openSUSE:Factory checked in at 2022-10-20 11:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eiciel (Old) and /work/SRC/openSUSE:Factory/.eiciel.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eiciel" Thu Oct 20 11:11:22 2022 rev:46 rq:1030033 version:0.10.0.rc2 Changes: -------- --- /work/SRC/openSUSE:Factory/eiciel/eiciel.changes 2022-05-31 17:38:07.275023271 +0200 +++ /work/SRC/openSUSE:Factory/.eiciel.new.2275/eiciel.changes 2022-10-20 11:11:49.800034069 +0200 @@ -1,0 +2,41 @@ +Tue Oct 18 02:30:20 UTC 2022 - Luciano Santos <luc14n0@opensuse.org> + +- Update to 0.10.0.rc2 version: + + This is a fully updated version to gtk4 and the new plugin + interface of GNOME Files 43. + + This version is meant to be used with GNOME Files 43 (and + later) and it will not work with any earlier version. + + The plugin support in GNOME Files 43 has been simplified, so + edition is not possible inside GNOME Files' Properties dialog. + Visualisation support has been implemented in GNOME Files. To + edit ACLs or Extended Attributes, use the contextual menu over + a file or directory in the files view of GNOME Files, this will + start Eiciel in edit mode for that file directly. + + Build system has been fully ported to Meson (Autotools has been + dropped). + + The id/app-id has been normalised from org.roger-ferrer.Eiciel + to org.roger_ferrer.Eiciel everywhere given the inconsistent + handling of the hyphen in the GNOME stack. +- Drop no longer needed update-desktop-files build requirement and + suse_update_desktop_file macro. +- Drop no longer needed libattr-devel and fdupes build requirements + and fdupes macro. +- Update pkgconfig module build requirements (align with Meson + script): + + "gtkmm-3.0 >= 3.0.0" to "gtkmm-4.0 >= 4.6"; + + "libnautilus-extension >= 3.0.0" to + "libnautilus-extension-4 >= 43" +- Add Meson build requirement and replace Autotools macros with + Meson's (configure/make_build/make_install to meson/meson_build/ + meson_install). +- Add new build requirements: "giomm-2.68 >= 2.68" pkgconfig module + and itstool. +- Update 'packageand(package1:package2)' obsolete Supplements + syntax to '(package1 and package2)' for supplementation of eiciel + and nautilus packages. +- Add 0001-Add-man-subdir-to-top-level-meson.build.patch and + 0001-Replace-deprecated-attr-xattr.h-with-sys-xattr.h.patch + patches to fix installation of manpage and check for sys/xattr.h + rather than deprecated attr/xattr.h, respectively. + +------------------------------------------------------------------- Old: ---- eiciel-0.9.13.1.tar.bz2 New: ---- 0001-Add-man-subdir-to-top-level-meson.build.patch 0001-Replace-deprecated-attr-xattr.h-with-sys-xattr.h.patch eiciel-0.10.0.rc2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eiciel.spec ++++++ --- /var/tmp/diff_new_pack.2Kl8b3/_old 2022-10-20 11:11:50.304035090 +0200 +++ /var/tmp/diff_new_pack.2Kl8b3/_new 2022-10-20 11:11:50.308035098 +0200 @@ -16,24 +16,33 @@ # -%define _libnautilus_extensiondir %(pkg-config --variable extensiondir libnautilus-extension) +%define _libnautilus_extensiondir %(pkg-config --variable extensiondir libnautilus-extension-4) Name: eiciel -Version: 0.9.13.1 +Version: 0.10.0.rc2 Release: 0 Summary: GNOME ACL viewer and editor License: GPL-2.0-or-later Group: System/GUI/GNOME URL: http://rofi.roger-ferrer.org/eiciel/ -Source0: http://rofi.roger-ferrer.org/eiciel/files/%{name}-%{version}.tar.bz2 -BuildRequires: fdupes +# Source0: http://rofi.roger-ferrer.org/eiciel/files/%%{name}-%%{version}.tar.bz2 +Source0: https://github.com/rofirrim/eiciel/archive/refs/tags/0.10.0-rc2.tar.gz#/%{name}-%{version}.tar.gz + +# FIX-UPSTREAM-PATCH 0001-Add-man-subdir-to-top-level-meson.build.patch luc14n0@opensuse.org +# Intall the manpage that was silently being ignored by Meson +Patch1: 0001-Add-man-subdir-to-top-level-meson.build.patch +# FIX-UPSTREAM-PATCH 0001-Replace-deprecated-attr-xattr.h-with-sys-xattr.h.patch luc14n0@opensuse.org +# Use sys/xattr.h in place of deprecated attr/xattr.h +Patch2: 0001-Replace-deprecated-attr-xattr.h-with-sys-xattr.h.patch + BuildRequires: gcc-c++ +BuildRequires: itstool BuildRequires: libacl-devel -BuildRequires: libattr-devel +BuildRequires: meson >= 0.57 BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.0.0 -BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0 +BuildRequires: pkgconfig(giomm-2.68) >= 2.68 +BuildRequires: pkgconfig(gtkmm-4.0) >= 4.6 +BuildRequires: pkgconfig(libnautilus-extension-4) >= 43 %description Eiciel allows you to visually edit file ACL entries. You can add and @@ -44,7 +53,7 @@ Summary: Nautilus ACL viewer and editor extension Group: System/GUI/GNOME Requires: %{name} = %{version} -Supplements: packageand(eiciel:nautilus) +Supplements: (eiciel and nautilus) %description -n nautilus-eiciel A Nautilus extension that allows viewing and editing ACL permissions. @@ -52,35 +61,28 @@ %lang_package %prep -%autosetup -p1 -sed -i -e 's!attr/xattr\.h!sys/xattr\.h!g' configure +%autosetup -p1 -n eiciel-0.10.0-rc2 %build -%configure \ - --disable-static -make %{?_smp_mflags} +%meson \ + -D man=true \ + %{nil} +%meson_build %install -%make_install +%meson_install %find_lang %{name} %{?no_lang_C} -find %{buildroot} -type f -name "*.la" -delete -print -%suse_update_desktop_file -r org.roger-ferrer.Eiciel System Filesystem -%fdupes %{buildroot}%{_datadir} %files %license COPYING -%doc AUTHORS ChangeLog NEWS README -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ +%doc AUTHORS README.md +%{_datadir}/help/C/%{name} %{_bindir}/eiciel %{_mandir}/man1/eiciel.1%{?ext_man} -%{_datadir}/applications/org.roger-ferrer.Eiciel.desktop -%{_datadir}/eiciel/ -%{_datadir}/icons/hicolor/*/apps/eiciel.* +%{_datadir}/applications/org.roger_ferrer.Eiciel.desktop +%{_datadir}/icons/hicolor/*/apps/*eiciel.* %dir %{_datadir}/metainfo -%{_datadir}/metainfo/org.roger-ferrer.Eiciel.appdata.xml +%{_datadir}/metainfo/org.roger_ferrer.Eiciel.appdata.xml %files -n nautilus-eiciel %{_libnautilus_extensiondir}/libeiciel-nautilus.so ++++++ 0001-Add-man-subdir-to-top-level-meson.build.patch ++++++ From ce9533088c841c21bc762404868d361771796192 Mon Sep 17 00:00:00 2001 From: Luciano Santos <luc14n0@opensuse.org> Date: Tue, 18 Oct 2022 04:12:31 -0300 Subject: [PATCH] Add man subdir to top-level meson.build Add the forgotten 'man' subdir to top-level meson.build script and add a boolean option to meson_options.txt so people can choose whether or not to install man pages. --- man/meson.build | 6 +++++- meson.build | 3 +++ meson_options.txt | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/man/meson.build b/man/meson.build index 6f57501..04951a0 100644 --- a/man/meson.build +++ b/man/meson.build @@ -1 +1,5 @@ -install_man('eiciel.1') +want_man = get_option('man') + +if want_man == true + install_man('eiciel.1') +endif diff --git a/meson.build b/meson.build index 5a7c7f6..e52a497 100644 --- a/meson.build +++ b/meson.build @@ -81,6 +81,9 @@ subdir('img') # Documentation subdir('doc') +# Manpage(s) +subdir('man') + # GNOME post-install duties gnome.post_install(gtk_update_icon_cache : true) diff --git a/meson_options.txt b/meson_options.txt index c32b6b9..caca81b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,6 @@ +option('man', type : 'boolean', + value : 'false', + description : 'Install man page(s)') option('user-attributes', type : 'feature', value : 'enabled', -- 2.37.3 ++++++ 0001-Replace-deprecated-attr-xattr.h-with-sys-xattr.h.patch ++++++ From 9202f1c906c375c28fe50070c326f770f750be67 Mon Sep 17 00:00:00 2001 From: Luciano Santos <luc14n0@opensuse.org> Date: Tue, 18 Oct 2022 05:36:43 -0300 Subject: [PATCH] Replace deprecated attr/xattr.h with sys/xattr.h We should move away from attr/xattr.h (libattr1) since it has been deprecated for quite a while now and glibc's sys/xattr.h is a drop-in replacement for it. --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5a7c7f6..aea2fb9 100644 --- a/meson.build +++ b/meson.build @@ -41,8 +41,8 @@ conf_data.set('HAVE_SYS_ACL_H', has_sys_acl_h) has_acl_libacl_h = compiler.has_header('acl/libacl.h') conf_data.set('HAVE_ACL_LIBACL_H', has_acl_libacl_h) -has_xattr_h = compiler.has_header('attr/xattr.h') -conf_data.set('HAVE_ATTR_XATTR_H', has_xattr_h) +has_sys_xattr_h = compiler.has_header('sys/xattr.h') +conf_data.set('HAVE_SYS_XATTR_H', has_sys_xattr_h) user_attributes_feature = get_option('user-attributes') conf_data.set('ENABLE_USER_XATTR', -- 2.37.3