3 changed files with 30 additions and 98 deletions
--- a/.gcr.metadata
+++ b/.gcr.metadata
@ -1 +1 @@
-d1267ce6f7821c8bf0d2a7df06d458d0df3769ce SOURCES/gcr-3.40.0.tar.xz
+65cddbc1e12266233aca4d1857a93b42ef52f620 SOURCES/gcr-3.28.0.tar.xz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gcr-3.40.0.tar.xz
+SOURCES/gcr-3.28.0.tar.xz
--- a/SPECS/gcr.spec
+++ b/SPECS/gcr.spec
@ -3,31 +3,30 @@
 %endif

 Name:           gcr
-Version:        3.40.0
-Release:        3%{?dist}
+Version:        3.28.0
+Release:        1%{?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.40/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz

-BuildRequires:  gettext
-BuildRequires:  gtk-doc
-BuildRequires:  meson
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(p11-kit-1)
+BuildRequires:  chrpath
 BuildRequires:  docbook-style-xsl
 BuildRequires:  libgcrypt-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  intltool
 BuildRequires:  vala
 %if 0%{?has_valgrind}
 BuildRequires:  valgrind-devel
 %endif
 BuildRequires:  /usr/bin/gpg2
+BuildRequires:  /usr/bin/valac
 BuildRequires:  /usr/bin/xsltproc
-Requires: %{name}-base%{?_isa} = %{version}-%{release}

 %description
 gcr is a library for displaying certificates, and crypto UI, accessing
@ -43,32 +42,37 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %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-3
-
-%description base
-The gcr-base package includes the gcr-base library.

 %prep
-%autosetup -p1
+%setup -q
+
+# Use system valgrind headers instead
+%if 0%{?has_valgrind}
+rm -rf build/valgrind/
+%endif

 %build
-%meson
-%meson_build
+%configure --enable-introspection
+make %{?_smp_mflags}


 %install
-%meson_install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.*
 %find_lang %{name}

+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gcr-viewer
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gcr-prompter
+

 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop


 %files -f %{name}.lang
-%doc NEWS README.md
+%doc README NEWS
 %license COPYING
 %{_bindir}/gcr-viewer
 %{_datadir}/applications/gcr-viewer.desktop
@ -78,7 +82,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_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*
+%{_libdir}/libgck-1.so.*
+%{_libdir}/libgcr-3.so.*
+%{_libdir}/libgcr-base-3.so.*
+%{_libdir}/libgcr-ui-3.so.*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/gcr-crypto-types.xml
 %{_libexecdir}/gcr-prompter
@ -91,6 +98,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_includedir}/gck-1
 %{_includedir}/gcr-3
 %{_libdir}/libgck-1.so
+%{_libdir}/libgcr-3.so
 %{_libdir}/libgcr-base-3.so
 %{_libdir}/libgcr-ui-3.so
 %{_libdir}/pkgconfig/gck-1.pc
@ -101,87 +109,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/gck
-%{_datadir}/gtk-doc/html/gcr
+%{_datadir}/gtk-doc/html/gcr-3
 %{_datadir}/vala/

-%files base
-%{_libdir}/libgck-1.so.0*
-%{_libdir}/libgcr-base-3.so.1*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.0-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Sat Mar 27 2021 Kalev Lember <klember@redhat.com> - 3.40.0-1
- Update to 3.40.0
- Tighten soname globs
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 16 2021 Kalev Lember <klember@redhat.com> - 3.38.1-1
- Update to 3.38.1
-
-* Mon Sep 28 2020 Kalev Lember <klember@redhat.com> - 3.38.0-2
- Avoid BuildRequiring vala twice
-
-* Mon Sep 28 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
-
-* Sun Sep 20 2020 Kalev Lember <klember@redhat.com> - 3.37.91-1
- Update to 3.37.91
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
-
-* 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
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 20 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
- Update to 3.35.1
- Switch to the meson build system
-
-* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
-
-* Mon Aug 19 2019 Kalev Lember <klember@redhat.com> - 3.33.4-1
- Update to 3.33.4
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jun 02 2019 Dan Horák <dan[at]danny.cz> - 3.28.1-4
- fix gcr-prompter crash (rhbz#1631759)
-
-* Thu Apr 11 2019 Fabiano Fidêncio <fidencio@redhat.com> - 3.28.1-3
- Split gcr-base into a new package
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Kalev Lember <klember@redhat.com> - 3.28.1-1
- Update to 3.28.1
-
-* Fri Jan 04 2019 Kalev Lember <klember@redhat.com> - 3.28.0-3
- Backport a patch to fix gnome-shell crashes with glib 2.59
- Use make_build and make_install macros
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
 - Update to 3.28.0