rpms/gcr3
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add back a few more needed bits instead of just libraries

Browse Source 
Only remove the bits that would conflict with gcr 4.
This commit is contained in:
Kalev Lember 2022-07-19 18:44:20 +02:00
parent b0bb411484
commit 76c1b04d70
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gcr3.spec
View File

@ -4,7 +4,7 @@
Name: gcr3 Name: gcr3
Version: 3.41.1 Version: 3.41.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: A library for bits of crypto UI and parsing Summary: A library for bits of crypto UI and parsing
License: LGPLv2+ License: LGPLv2+
@ -34,6 +34,9 @@ BuildRequires: /usr/bin/ssh-agent
BuildRequires: /usr/bin/xsltproc BuildRequires: /usr/bin/xsltproc
Requires: %{name}-base%{?_isa} = %{version}-%{release} 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 # Explicitly conflict with older gcr package that ships the same libraries
Conflicts: gcr < 3.90.0 Conflicts: gcr < 3.90.0
@ -72,31 +75,30 @@ The %{name}-base package includes the gcr-base library.
%meson_install %meson_install
%find_lang gcr %find_lang gcr
# Remove the bits that we don't need in the compat package # Remove the bits that would conflict with gcr 4 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
rm -rf $RPM_BUILD_ROOT%{_libexecdir}/gcr-ssh-agent 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.service
rm -rf $RPM_BUILD_ROOT%{_userunitdir}/gcr-ssh-agent.socket 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 %files -f gcr.lang
%doc NEWS README.md %doc NEWS README.md
%license COPYING %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}/girepository-1.0/
%{_libdir}/libgcr-ui-3.so.1* %{_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 %files devel
%{_includedir}/gck-1/ %{_includedir}/gck-1/
@ -110,11 +112,17 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gcr-ui-3/
%{_libdir}/pkgconfig/gcr-ui-3.pc %{_libdir}/pkgconfig/gcr-ui-3.pc
%{_datadir}/gir-1.0/ %{_datadir}/gir-1.0/
%{_datadir}/vala/ %{_datadir}/vala/
%doc %{_datadir}/doc/gck-1/
%doc %{_datadir}/doc/gcr-3/
%doc %{_datadir}/doc/gcr-ui-3/
%files base %files base
%{_libdir}/libgck-1.so.0* %{_libdir}/libgck-1.so.0*
%{_libdir}/libgcr-base-3.so.1* %{_libdir}/libgcr-base-3.so.1*
%changelog %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 * 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 - Initial build of parallel-installable gcr3 version, based on earlier gcr packaging