From 76c1b04d70331908afee82402a8175c925b23e1d Mon Sep 17 00:00:00 2001 From: Kalev Lember <klember@redhat.com> Date: Tue, 19 Jul 2022 18:44:20 +0200 Subject: [PATCH] Add back a few more needed bits instead of just libraries Only remove the bits that would conflict with gcr 4. --- gcr3.spec | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/gcr3.spec b/gcr3.spec index bf2d07f..4f6c400 100644 --- a/gcr3.spec +++ b/gcr3.spec @@ -4,7 +4,7 @@ Name: gcr3 Version: 3.41.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for bits of crypto UI and parsing License: LGPLv2+ @@ -34,6 +34,9 @@ BuildRequires: /usr/bin/ssh-agent BuildRequires: /usr/bin/xsltproc Requires: %{name}-base%{?_isa} = %{version}-%{release} +Requires: /usr/bin/ssh-add +Requires: /usr/bin/ssh-agent + # Explicitly conflict with older gcr package that ships the same libraries Conflicts: gcr < 3.90.0 @@ -72,31 +75,30 @@ The %{name}-base package includes the gcr-base library. %meson_install %find_lang gcr -# Remove the bits that we don't need in the compat package -rm -rf $RPM_BUILD_ROOT%{_bindir}/gcr-viewer -rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop -rm -rf $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert -rm -rf $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert -rm -rf $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml -rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps/* -rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/packages/gcr-crypto-types.xml -rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gcr-prompter +# Remove the bits that would conflict with gcr 4 package rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gcr-ssh-agent -rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gcr-ssh-askpass -rm -rf $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service -rm -rf $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service -rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/gcr-prompter.desktop rm -rf $RPM_BUILD_ROOT%{_userunitdir}/gcr-ssh-agent.service rm -rf $RPM_BUILD_ROOT%{_userunitdir}/gcr-ssh-agent.socket -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gck-1/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gcr-3/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gcr-ui-3/ %files -f gcr.lang %doc NEWS README.md %license COPYING +%{_bindir}/gcr-viewer +%{_datadir}/applications/gcr-viewer.desktop +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/gsettings +%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert +%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert +%{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml %{_libdir}/girepository-1.0/ %{_libdir}/libgcr-ui-3.so.1* +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/mime/packages/gcr-crypto-types.xml +%{_libexecdir}/gcr-prompter +%{_libexecdir}/gcr-ssh-askpass +%{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service +%{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service +%{_datadir}/applications/gcr-prompter.desktop %files devel %{_includedir}/gck-1/ @@ -110,11 +112,17 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gcr-ui-3/ %{_libdir}/pkgconfig/gcr-ui-3.pc %{_datadir}/gir-1.0/ %{_datadir}/vala/ +%doc %{_datadir}/doc/gck-1/ +%doc %{_datadir}/doc/gcr-3/ +%doc %{_datadir}/doc/gcr-ui-3/ %files base %{_libdir}/libgck-1.so.0* %{_libdir}/libgcr-base-3.so.1* %changelog +* Tue Jul 19 2022 Kalev Lember <klember@redhat.com> - 3.41.1-2 +- Add back a few more needed bits instead of just libraries + * Tue Jul 19 2022 Kalev Lember <klember@redhat.com> - 3.41.1-1 - Initial build of parallel-installable gcr3 version, based on earlier gcr packaging