diff --git a/.gitignore b/.gitignore index 6bd90e7..0a59118 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /keepassxc-2.7.1-src.tar.xz.sig /keepassxc-2.7.4-src.tar.xz /keepassxc-2.7.4-src.tar.xz.sig +/keepassxc-2.7.5-src.tar.xz +/keepassxc-2.7.5-src.tar.xz.sig diff --git a/appdata.patch b/appdata.patch deleted file mode 100644 index 59c0d2e..0000000 --- a/appdata.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 772964886ebb40d9634f2fabf2e04c0df40de667 Mon Sep 17 00:00:00 2001 -From: Jonathan White -Date: Sat, 29 Oct 2022 22:11:12 -0400 -Subject: [PATCH] Fix appdata.xml formatting - ---- - share/linux/org.keepassxc.KeePassXC.appdata.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml -index 04904de7ab..c899a66018 100644 ---- a/share/linux/org.keepassxc.KeePassXC.appdata.xml -+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml -@@ -73,7 +73,8 @@ -
  • Flatpak: Fix launching browser proxy service [#8680]
    • -
  • SSH Agent: Fix paegent support on Windows [#8619]
    • - -- -+ - - -
      diff --git a/keepassxc.spec b/keepassxc.spec index 9a4b7d4..1f9c29f 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,8 +2,8 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.7.4 -Release: 10%{?dist} +Version: 2.7.5 +Release: 1%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain URL: https://keepassxc.org/ @@ -41,7 +41,6 @@ Source2: https://keepassxc.org/keepassxc_master_signing_key.asc %if (%{defined rhel} || (%{defined fedora} && 0%{?fedora} < 38)) Patch0: xcb.patch %endif -Patch1: appdata.patch BuildRequires: botan2-devel BuildRequires: cmake >= 3.1 @@ -106,7 +105,7 @@ Provides: bundled(ykcore) # filled https://bugzilla.redhat.com/show_bug.cgi?id=2144863 # to be compliant to "Architecture Build Failures" paragraph of Fedora Packaging Guidelines # https://docs.fedoraproject.org/en-US/packaging-guidelines/#_architecture_build_failures -%if 0%{?el8} +%if %{defined rhel} && 0%{?rhel} == 8 ExcludeArch: s390x %endif @@ -134,19 +133,26 @@ information can be considered as quite safe. %autosetup -p1 # Older version of appstream-util can't parse some url types -%if (%{defined fedora} && 0%{?fedora} < 36) || (%{defined rhel} && 0%{?rhel} <= 9) +%if (%{defined rhel} && 0%{?rhel} <= 9) sed -i '/type="vcs-browser"/d' ./share/linux/org.keepassxc.KeePassXC.appdata.xml sed -i '/type="contribute"/d' ./share/linux/org.keepassxc.KeePassXC.appdata.xml %endif +# Older version of desktop-file-utils before 0.26 don't know about some fields +# Remove when desktop-file-utils 0.26 is available in EPEL8 +%if (%{defined rhel} && 0%{?rhel} <= 9) +sed -i 's/Version=1.5/Version=1.0/' ./share/linux/org.keepassxc.KeePassXC.desktop.in +sed -i '/^SingleMainWindow=true/d' ./share/linux/org.keepassxc.KeePassXC.desktop.in +%endif + %build -%if %{defined rhel} -. /opt/rh/gcc-toolset-12/enable +%if %{defined rhel} && 0%{?rhel} == 8 +%enable_devtoolset12 +# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{10,11,12}-annobin +# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but +# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler. +%undefine _annotated_build %endif -# -DWITH_XC_DOCS=OFF is needed on EL due missing rubygem-asciidoctor -# For EL8 missing rubygem-asciidoctor read -# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 -# https://bugzilla.redhat.com/show_bug.cgi?id=1820896 %cmake \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \ @@ -164,21 +170,6 @@ desktop-file-install \ --add-mime-type application/x-keepassxc \ %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop -# Associate KDB* files -cat > x-keepassxc.desktop << EOF -[Desktop Entry] -Comment= -Hidden=false -Icon=keepassxc.png -MimeType=application/x-keepassxc -Patterns=*.kdb;*.KDB;*.kdbx;*.KDBX* -Type=MimeType -EOF -install -D -m 644 -p x-keepassxc.desktop \ - %{buildroot}%{_datadir}/mimelnk/application/x-keepassxc.desktop - - - %find_lang %{name} --with-qt %check @@ -197,7 +188,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_datadir}/keepassxc/wordlists %{_datadir}/applications/org.%{name}.KeePassXC.desktop %{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml -%{_datadir}/mimelnk %{_datadir}/mime/packages/*.xml %{_datadir}/icons/hicolor/*/*/*keepassxc* %{_libdir}/%{name} @@ -205,6 +195,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Mon May 15 2023 Mikel Olasagasti Uranga - 2.7.5-1 +- Update to 2.7.5 +- Use enable_devtoolset12 macro for EPEL8 +- Undefined _annotated_build for EPEL8 +- Remove unneeded comment about DOCS +- Remove custom mimetype desktop file as this method is deprecated + * Sat Apr 29 2023 Michael J Gruber - 2.7.4-10 - adjust URL to current working one diff --git a/sources b/sources index 966c3d4..2794a40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (keepassxc-2.7.4-src.tar.xz) = 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb -SHA512 (keepassxc-2.7.4-src.tar.xz.sig) = 9668c0956bccb4d1875a81210da97bfe3b2a66cd6a9cfc84e1d41555d497e1db8d3da1c739be98e083dea772e0a2ab0bdc2034cfdd395000b36d8fc9e7363d56 +SHA512 (keepassxc-2.7.5-src.tar.xz) = 904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b +SHA512 (keepassxc-2.7.5-src.tar.xz.sig) = 174707634c54da63cdbd2935e2c39d530ecdfc78fb3f9015b384d4b4c3cf12111ac4eb122aa3f9269b7823db49cada7154af8cd27691cefc72b2d1dd86229b00