Compare commits

..

1 Commits

Author SHA1 Message Date
960ce7ca7c import RHEL 10 Beta snapshot-45.2-4.el10 2024-11-20 13:32:52 +00:00
6 changed files with 87 additions and 22 deletions

5
.gitignore vendored
View File

@ -1,4 +1 @@
/snapshot-45.0.tar.xz
/snapshot-45.1.tar.xz
/snapshot-45.2.tar.xz
/snapshot-46.3.tar.xz
snapshot-45.2.tar.xz

31
175.patch Normal file
View File

@ -0,0 +1,31 @@
From cef8ed2fdcc4c2307e4aa2135767e462a6ab1fed Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 14 Nov 2023 16:34:29 -0500
Subject: [PATCH] appstream: use developer instead of deprecated developer_name
This fixes a validate-appdata test failure due to deprecation warnings
when run with appstreamcli 1.0:
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer
---
data/org.gnome.Snapshot.metainfo.xml.in.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/org.gnome.Snapshot.metainfo.xml.in.in b/data/org.gnome.Snapshot.metainfo.xml.in.in
index 2dc32d8..d99dfa6 100644
--- a/data/org.gnome.Snapshot.metainfo.xml.in.in
+++ b/data/org.gnome.Snapshot.metainfo.xml.in.in
@@ -98,7 +98,9 @@
<kudo>ModernToolkit</kudo>
<kudo>HiDpiIcon</kudo>
</kudos>
- <developer_name>The GNOME Project</developer_name>
+ <developer id="gnome.org">
+ <name>The GNOME Project</name>
+ </developer>
<update_contact>msandova@gnome.org</update_contact>
<translation type="gettext">@gettext-package@</translation>
<launchable type="desktop-id">@app-id@.desktop</launchable>
--
GitLab

View File

@ -1,3 +0,0 @@
# snapshot
The snapshot package

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,3 +1,13 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.1)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 4;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%bcond_without check
%if 0%{?rhel}
@ -9,7 +19,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: snapshot
Version: 46.3
Version: 45.2
Release: %autorelease
Summary: Take pictures and videos
@ -29,11 +39,14 @@ SourceLicense: GPL-3.0-or-later
License: (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND GPL-3.0-or-later AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
# LICENSE.dependencies contains a full license breakdown
URL: https://gitlab.gnome.org/GNOME/snapshot
Source: https://download.gnome.org/sources/snapshot/46/snapshot-%{tarball_version}.tar.xz
Source: https://download.gnome.org/sources/snapshot/45/snapshot-%{tarball_version}.tar.xz
# Downstream patch to disable linting as part of self tests
Patch: 0001-Disable-cargo-clippy-test.patch
# https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/175
Patch: 175.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
@ -102,11 +115,7 @@ cd ~-
%if %{with check}
%check
%meson_test \
%ifarch riscv64
--timeout-multiplier 10 \
%endif
%{nil}
%meson_test
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.gnome.Snapshot.metainfo.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Snapshot.desktop
@ -130,4 +139,41 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Snapshot
%changelog
%autochangelog
## START: Generated by rpmautospec
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 45.2-4
- Bump release for June 2024 mass rebuild
* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 45.2-3
- Update Rust macro usage
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 27 2023 Kalev Lember <klember@redhat.com> - 45.2-1
- Update to 45.2
* Sat Dec 09 2023 Kalev Lember <klember@redhat.com> - 45.1-1
- Update to 45.1
* Wed Nov 15 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 45.0-6
- Fix RHEL build
* Wed Nov 15 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 45.0-5
- Fix build with appstream 1.0
* Fri Oct 06 2023 Kalev Lember <klember@redhat.com> - 45.0-4
- Backport upstream MR !168 to fix portal requests
* Mon Oct 02 2023 Kalev Lember <klember@redhat.com> - 45.0-3
- Use bundled rust deps on RHEL
* Sun Oct 01 2023 Kalev Lember <klember@redhat.com> - 45.0-2
- Package review fixes (rhbz#2241553)
- Add SourceLicense tag to distinguish between the license of the app
itself and its crate deps
- Slightly change virtual provides for bundled aperture crate to better
match other rust packages
* Sun Oct 01 2023 Kalev Lember <klember@redhat.com> - 45.0-1
- Initial Fedora packaging (rhbz#2241553)
## END: Generated by rpmautospec

View File

@ -1 +1 @@
SHA512 (snapshot-46.3.tar.xz) = d2fc212727d90ec403f743b8fe92fbdd47d3e8bb80b79b21035be8f9f97c682011c72a7f07d2dd44c963464312c18043ebd5de1ecffb52f1dfe2b2a799690e5f
SHA512 (snapshot-45.2.tar.xz) = 821fb43fbf8c71dd669054889e6860974a3725d30509e00bf35ef908d97966bf9d55f8689e38371d331e4d629f19cd8f8cc874781b8fe57dbea6f029adcfaf26