diff --git a/gcr-3.28.0.tar.xz b/gcr-3.28.0.tar.xz deleted file mode 100644 index f56f2ef7a4ed189e2d06691f8f33b5294b1a6752..0000000000000000000000000000000000000000 Binary files a/gcr-3.28.0.tar.xz and /dev/null differ diff --git a/gcr-3.40.0.tar.xz b/gcr-3.40.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3f2c1d2a73fc70fdd03c653335463a4c2f1c3aa5 Binary files /dev/null and b/gcr-3.40.0.tar.xz differ diff --git a/gcr.spec b/gcr.spec index 1b7312c11b028acc9cda0e2327d1f32b1973c13d..5e133dcdd81d24a242ca2452ebd276d75e074933 100644 --- a/gcr.spec +++ b/gcr.spec @@ -1,33 +1,34 @@ +%define anolis_release .0.1 %ifarch %{valgrind_arches} %global has_valgrind 1 %endif -%define anolis_release .0.1 Name: gcr -Version: 3.28.0 -Release: 1%{anolis_release}%{?dist} +Version: 3.40.0 +Release: 3%{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.28/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.40/%{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} Requires: glibc Provides: /usr/bin/gcr-viewer @@ -54,36 +55,32 @@ 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 -%prep -%setup -q +%description base +The gcr-base package includes the gcr-base library. -# Use system valgrind headers instead -%if 0%{?has_valgrind} -rm -rf build/valgrind/ -%endif +%prep +%autosetup -p1 %build -%configure --enable-introspection -make %{?_smp_mflags} +%meson +%meson_build %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.* +%meson_install %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 %license COPYING %{_bindir}/gcr-viewer %{_datadir}/applications/gcr-viewer.desktop @@ -93,10 +90,7 @@ 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}/libgck-1.so.* -%{_libdir}/libgcr-3.so.* -%{_libdir}/libgcr-base-3.so.* -%{_libdir}/libgcr-ui-3.so.* +%{_libdir}/libgcr-ui-3.so.1* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/mime/packages/gcr-crypto-types.xml %{_libexecdir}/gcr-prompter @@ -106,13 +100,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop %{_datadir}/applications/gcr-prompter.desktop %files doc -%doc README NEWS +%doc NEWS %files devel %{_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 @@ -123,14 +116,90 @@ 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-3 +%{_datadir}/gtk-doc/html/gcr %{_datadir}/vala/ +%files base +%{_libdir}/libgck-1.so.0* +%{_libdir}/libgcr-base-3.so.1* %changelog -* Sun Jul 17 2022 DengXiewei - 3.28.0-1.0.1 +* Tue Nov 29 2022 DengXiewei - 3.40.0-3.0.1 - Add doc sub package +* Mon Aug 09 2021 Mohan Boddu - 3.40.0-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 3.40.0-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Sat Mar 27 2021 Kalev Lember - 3.40.0-1 +- Update to 3.40.0 +- Tighten soname globs + +* Tue Jan 26 2021 Fedora Release Engineering - 3.38.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 16 2021 Kalev Lember - 3.38.1-1 +- Update to 3.38.1 + +* Mon Sep 28 2020 Kalev Lember - 3.38.0-2 +- Avoid BuildRequiring vala twice + +* Mon Sep 28 2020 Kalev Lember - 3.38.0-1 +- Update to 3.38.0 + +* Sun Sep 20 2020 Kalev Lember - 3.37.91-1 +- Update to 3.37.91 + +* Mon Jul 27 2020 Fedora Release Engineering - 3.36.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Mar 11 2020 Kalev Lember - 3.36.0-1 +- Update to 3.36.0 + +* Tue Feb 18 2020 Kalev Lember - 3.35.91-1 +- Update to 3.35.91 + +* Mon Feb 03 2020 Kalev Lember - 3.35.90-1 +- Update to 3.35.90 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.35.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Kalev Lember - 3.35.1-1 +- Update to 3.35.1 +- Switch to the meson build system + +* Mon Oct 14 2019 Kalev Lember - 3.34.0-1 +- Update to 3.34.0 + +* Mon Aug 19 2019 Kalev Lember - 3.33.4-1 +- Update to 3.33.4 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.28.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 02 2019 Dan Horák - 3.28.1-4 +- fix gcr-prompter crash (rhbz#1631759) + +* Thu Apr 11 2019 Fabiano Fidêncio - 3.28.1-3 +- Split gcr-base into a new package + +* Thu Jan 31 2019 Fedora Release Engineering - 3.28.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 Kalev Lember - 3.28.1-1 +- Update to 3.28.1 + +* Fri Jan 04 2019 Kalev Lember - 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 - 3.28.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0