Compare commits

...

No commits in common. "c8" and "c9" have entirely different histories.
c8 ... c9

4 changed files with 145 additions and 45 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/seahorse-3.20.0.tar.xz
SOURCES/seahorse-40.0.tar.xz

View File

@ -1 +1 @@
db7f592b475c95b5331aadd509d56ffcb4e04d4e SOURCES/seahorse-3.20.0.tar.xz
6d211cd8721ea0413031d698473fb411cca57128 SOURCES/seahorse-40.0.tar.xz

25
SOURCES/170.patch Normal file
View File

@ -0,0 +1,25 @@
From 5afb3c219867f264f817c9be7e50353566cc325c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 14 Apr 2021 23:25:45 +0800
Subject: [PATCH] Allow building with GnuPG-2.3.x
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 978f1f10..0ed0ec26 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ endif
# Dependencies
min_glib_version = '2.58'
min_gcr_version = '3.38'
-accepted_gpg_versions = [ '2.2.0' ]
+accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
glib_deps = [
--
GitLab

View File

@ -1,14 +1,18 @@
Name: seahorse
Version: 3.20.0
Release: 9%{?dist}
Summary: A GNOME application for managing encryption keys
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: seahorse
Version: 40.0
Release: 2%{?dist}
Summary: A GNOME application for managing encryption keys
# seahorse is GPLv2+
# libcryptui is LGPLv2+
License: GPLv2+ and LGPLv2+
URL: https://wiki.gnome.org/Apps/Seahorse
#VCS: git:git://git.gnome.org/seahorse
Source: https://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz
Source: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
# Fix the build with gnupg 2.3.x
Patch0: 170.patch
BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(avahi-glib)
@ -16,29 +20,28 @@ BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gck-1)
BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(libsecret-unstable)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(pwquality)
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl
BuildRequires: gettext
BuildRequires: gpgme-devel >= 1.0
BuildRequires: gnupg2
BuildRequires: itstool
BuildRequires: libSM-devel
BuildRequires: meson
BuildRequires: openldap-devel
BuildRequires: openssh-clients
BuildRequires: intltool
BuildRequires: vala
BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/xsltproc
# https://bugzilla.redhat.com/show_bug.cgi?id=474419
# https://bugzilla.redhat.com/show_bug.cgi?id=587328
Requires: pinentry-gui
Obsoletes: seahorse-devel < 3.1.4-2
Obsoletes: seahorse-plugins < 2.91.6-0.8
# Self-obsoletes to assist with seahorse-sharing package split
Obsoletes: seahorse < 3.1.4
%description
Seahorse is a graphical interface for managing and using encryption keys.
It also integrates with nautilus, gedit and other places for encryption
@ -46,59 +49,131 @@ operations. It is a keyring manager.
%prep
%setup -q
%autosetup -p1 -n %{name}-%{tarball_version}
%build
%configure
%meson -Dmanpage=true
%meson_build
make %{?_smp_mflags}
# cleanup permissions for files that go into debuginfo
find . -type f -name "*.c" -exec chmod a-x {} ';'
%install
make install DESTDIR=$RPM_BUILD_ROOT
#mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
#install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/seahorse-agent.sh
%meson_install
%find_lang seahorse --with-gnome --all-name
desktop-file-install --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category GNOME \
--add-category Utility \
--add-category X-Fedora \
${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
# nuke the icon cache
rm -f ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/icon-theme.cache
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/*.appdata.xml
appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.appdata.xml
desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/org.gnome.seahorse.Application.desktop
%files -f %{name}.lang
%doc AUTHORS NEWS README TODO
%license COPYING COPYING.LIB
%license COPYING*
%{_bindir}/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/appdata/*.appdata.xml
%{_libexecdir}/seahorse/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/seahorse.png
%{_datadir}/icons/hicolor/*/apps/seahorse-preferences.png
%{_datadir}/icons/hicolor/symbolic/apps/seahorse-symbolic.svg
%{_mandir}/man1/*.1*
%{_libdir}/seahorse/
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.seahorse.Application.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.seahorse.Application-symbolic.svg
%{_datadir}/dbus-1/services/org.gnome.seahorse.Application.service
%{_datadir}/GConf/gsettings/*.convert
%{_datadir}/glib-2.0/schemas/*.gschema.xml
%dir %{_datadir}/gnome-shell/
%dir %{_datadir}/gnome-shell/search-providers/
%{_datadir}/gnome-shell/search-providers/seahorse-search-provider.ini
%{_datadir}/metainfo/*.appdata.xml
%{_datadir}/seahorse/
%{_mandir}/man1/*.1*
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 40~alpha-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 40~alpha-1
- Update to 40.alpha
* Tue Feb 16 2021 Kalev Lember <klember@redhat.com> - 3.38.1-1
- Update to 3.38.1
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 9 2020 Kalev Lember <klember@redhat.com> - 3.38.0.1-1
- Update to 3.38.0.1
- Switch to libhandy1
* Mon Aug 24 2020 Kalev Lember <klember@redhat.com> - 3.37.2-1
- Update to 3.37.2
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Kalev Lember <klember@redhat.com> - 3.37.1-1
- Update to 3.37.1
* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 3.36.2-1
- Update to 3.36.2
* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36-1
- Update to 3.36
* Tue Feb 18 2020 Kalev Lember <klember@redhat.com> - 3.35.91-1
- Update to 3.35.91
* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
- Update to 3.35.90
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 10 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
- Update to 3.35.1
* Tue Jan 07 2020 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Tue Oct 01 2019 Kalev Lember <klember@redhat.com> - 3.34-1
- Update to 3.34
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 17 2019 Kalev Lember <klember@redhat.com> - 3.32.2-1
- Update to 3.32.2
* Mon May 06 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
- Update to 3.32.1
* Tue Mar 12 2019 Kalev Lember <klember@redhat.com> - 3.32-1
- Update to 3.32
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.91-2
- Rebuilt against fixed atk (#1626575)
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
- Update to 3.31.91
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 09 2019 Kalev Lember <klember@redhat.com> - 3.31.1-1
- Update to 3.31.1
* Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 3.30.1.1-1
- Update to 3.30.1.1
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30-1
- Update to 3.30
- Switch to the meson build system
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild