diff --git a/gcr-3.41.1.tar.xz b/gcr-3.41.1.tar.xz deleted file mode 100644 index 63774fb577c3352b138afc6c5938884e3ab3b898..0000000000000000000000000000000000000000 Binary files a/gcr-3.41.1.tar.xz and /dev/null differ diff --git a/gcr-3.92.0.tar.xz b/gcr-3.92.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..0ba30564196ad8813778ea8ff52bf76486883a1a Binary files /dev/null and b/gcr-3.92.0.tar.xz differ diff --git a/gcr.spec b/gcr.spec index c60abe3e29a4eb9250c82ff00a83c27b2545afc2..f859643e2f7dd5788fd16e3c73655bac0b7c129b 100644 --- a/gcr.spec +++ b/gcr.spec @@ -1,36 +1,29 @@ %define anolis_release 1 + %ifarch %{valgrind_arches} %global has_valgrind 1 %endif Name: gcr -Version: 3.41.1 -Release: %{anolis_release}%{dist} +Version: 3.92.0 +Release: %{anolis_release}%{dist} Summary: A library for bits of crypto UI and parsing License: LGPLv2+ URL: https://wiki.gnome.org/Projects/CryptoGlue -Source0: https://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.92/%{name}-%{version}.tar.xz BuildRequires: gettext BuildRequires: gi-docgen BuildRequires: meson >= 0.52 -BuildRequires: pkgconfig(gio-2.0) >= 2.44 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.44 -BuildRequires: pkgconfig(glib-2.0) >= 2.44 -BuildRequires: pkgconfig(gmodule-no-export-2.0) >= 2.44 -BuildRequires: pkgconfig(gobject-2.0) >= 2.44 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gthread-2.0) >= 2.44 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 +BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libgcrypt) >= 1 BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(p11-kit-1) >= 0.19.0 BuildRequires: pkgconfig(systemd) -BuildRequires: docbook-style-xsl -BuildRequires: libgcrypt-devel -BuildRequires: desktop-file-utils BuildRequires: systemd-rpm-macros BuildRequires: vala %if 0%{?has_valgrind} @@ -60,20 +53,27 @@ BuildArch: noarch %description doc The %{name}-doc package contains documentation files for %{name}. +%package libs +Summary: gcr and gck libraries +Obsoletes: %{name}-base < 3.92.0-1 +Provides: %{name}-base = %{version}-%{release} + +Obsoletes: %{name}-gtk3 < 3.92.0-1 +Obsoletes: %{name}-gtk4-devel < 3.92.0-1 + +%description libs +The %{name}-libs package contains the gcr and gck shared libraries. + %package devel Summary: Development files for gcr Requires: %{name} = %{version}-%{release} +Obsoletes: %{name}-gtk3-devel < 3.92.0-1 +Obsoletes: %{name}-gtk4-devel < 3.92.0-1 + %description devel The gcr-devel package includes the header files for the gcr library. -%package base -Summary: Library files for gcr -Conflicts: %{name} < 3.28.1 - -%description base -The gcr-base package includes the gcr-base library. - %prep %autosetup -p1 @@ -84,14 +84,10 @@ The gcr-base package includes the gcr-base library. %install %meson_install -%find_lang %{name} +%find_lang gcr-4 %generate_compatibility_deps -%check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop - - %post %systemd_user_post gcr-ssh-agent.service @@ -102,57 +98,56 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop %systemd_user_postun_with_restart gcr-ssh-agent.service -%files -f %{name}.lang -%license COPYING -%{_bindir}/gcr-viewer -%{abidir}/gcr-viewer-option.list -%{_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* -%{abidir}/libgcr-ui-3.dump -%{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/mime/packages/gcr-crypto-types.xml -%{_libexecdir}/gcr-prompter +%files +%doc NEWS README.md +%{_bindir}/gcr-viewer-gtk4 +%{abidir}/gcr-viewer-gtk4-option.list %{_libexecdir}/gcr-ssh-agent -%{_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 +%{_libexecdir}/gcr4-ssh-askpass %{_userunitdir}/gcr-ssh-agent.service %{_userunitdir}/gcr-ssh-agent.socket %files doc %doc NEWS README.md -%files devel -%{_includedir}/gck-1 -%{_includedir}/gcr-3 -%{_libdir}/libgck-1.so -%{_libdir}/libgcr-base-3.so -%{_libdir}/libgcr-ui-3.so -%{_libdir}/pkgconfig/gck-1.pc -%{_libdir}/pkgconfig/gcr-3.pc -%{_libdir}/pkgconfig/gcr-base-3.pc -%{_libdir}/pkgconfig/gcr-ui-3.pc -%{_datadir}/gir-1.0/* -%{_datadir}/doc/gck-1 -%{_datadir}/doc/gcr-3 -%{_datadir}/doc/gcr-ui-3 -%{_datadir}/vala/* - -%files base +%files libs -f gcr-4.lang +%license COPYING %dir %{abidir} -%{_libdir}/libgck-1.so.0* -%{_libdir}/libgcr-base-3.so.1* -%{abidir}/libgck-1.dump -%{abidir}/libgcr-base-3.dump +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Gck-2.typelib +%{_libdir}/girepository-1.0/Gcr-4.typelib +%{_libdir}/libgck-2.so.0.0.0 +%{_libdir}/libgck-2.so.1.92.0 +%{abidir}/libgck-2.dump +%{_libdir}/libgcr-4.so.0.0.0 +%{_libdir}/libgcr-4.so.3.92.0 +%{abidir}/libgcr-4.dump + +%files devel +%{_includedir}/gck-2/ +%{_includedir}/gcr-4/ +%{_libdir}/libgck-2.so +%{_libdir}/libgcr-4.so +%{_libdir}/pkgconfig/gck-2.pc +%{_libdir}/pkgconfig/gcr-4.pc +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Gck-2.gir +%{_datadir}/gir-1.0/Gcr-4.gir +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/gck-2.deps +%{_datadir}/vala/vapi/gck-2.vapi +%{_datadir}/vala/vapi/gcr-4.deps +%{_datadir}/vala/vapi/gcr-4.vapi +%doc %{_datadir}/doc/gck-2/ +%doc %{_datadir}/doc/gcr-4/ %changelog +* Thu Mar 16 2023 yuanhui - 3.92.0-1 +- Update to 3.92.0 +- Remove gtk3 and gtk4 subpackages as the gcr gtk3 and gtk4 libraries are gone +- Rename gcr-base to gcr-libs + * Mon Nov 28 2022 Funda Wang - 3.41.1-1 - New version 3.41.1