import snapshot-45.2-4.el10

4 months ago · 99070dfefc
commit 99070dfefc
5 changed files with 250 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+SOURCES/snapshot-45.2.tar.xz
--- a/.snapshot.metadata
+++ b/.snapshot.metadata
@ -0,0 +1 @@
+efe221021a372d7be390f117212d5190ef8f38f6 SOURCES/snapshot-45.2.tar.xz
--- a/SOURCES/0001-Disable-cargo-clippy-test.patch
+++ b/SOURCES/0001-Disable-cargo-clippy-test.patch
@ -0,0 +1,38 @@
+From d63c1af96dd20a7d7fabcf7a5e0f0b64944fe28e Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Sat, 30 Sep 2023 20:08:34 +0200
+Subject: [PATCH] Disable cargo clippy test
+
+Linting doesn't make sense as part of downstream builds.
+---
+ src/meson.build | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 33ff42e..cb86977 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -52,20 +52,6 @@ cargo_build = custom_target(
+   ]
+ )
+ 
+-test (
+-  'Cargo clippy',
+-  cargo,
+-  args: [
+-    'clippy',
+-    '--no-deps',
+-    cargo_options,
+-  ],
+-  env: [
+-    cargo_env,
+-  ],
+-  timeout: 400, # cargo might take a bit of time sometimes
+-)
+-
+ test (
+   'Cargo tests',
+   cargo,
+-- 
+2.41.0
+
--- a/SOURCES/175.patch
+++ b/SOURCES/175.patch
@ -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
+
--- a/SPECS/snapshot.spec
+++ b/SPECS/snapshot.spec
@ -0,0 +1,179 @@
+## 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}
+%global bundled_rust_deps 1
+%else
+%global bundled_rust_deps 0
+%endif
+
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
+Name:           snapshot
+Version:        45.2
+Release:        %autorelease
+Summary:        Take pictures and videos
+
+# snapshot itself is GPL-3.0-or-later
+SourceLicense:  GPL-3.0-or-later
+# ... and its crate dependencies are:
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# GPL-3.0-or-later
+# MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# MPL-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+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/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}
+
+%if 0%{?rhel}
+BuildRequires:  rust-toolset
+%else
+BuildRequires:  cargo-rpm-macros
+%endif
+BuildRequires:  meson
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
+BuildRequires:  pkgconfig(gstreamer-video-1.0)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  /usr/bin/appstream-util
+BuildRequires:  /usr/bin/desktop-file-validate
+
+# For camerabin
+Requires:       gstreamer1-plugins-bad-free%{_isa}
+# For hicolor icon theme directories
+Requires:       hicolor-icon-theme
+
+Provides:       bundled(crate(aperture)) = 0.3.1
+
+%description
+Take pictures and videos on your computer, tablet, or phone.
+
+
+%prep
+%autosetup -p1 -n snapshot-%{tarball_version}
+
+%if 0%{?bundled_rust_deps}
+%cargo_prep -v vendor
+%else
+rm -rf vendor
+%cargo_prep
+%endif
+
+
+%if ! 0%{?bundled_rust_deps}
+%generate_buildrequires
+%cargo_generate_buildrequires
+cd aperture
+%cargo_generate_buildrequires
+cd ~-
+%endif
+
+
+%build
+%meson
+%meson_build
+
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%if 0%{?bundled_rust_deps}
+%cargo_vendor_manifest
+%endif
+
+
+%install
+%meson_install
+
+%find_lang snapshot --with-gnome
+
+
+%if %{with check}
+%check
+%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
+%endif
+
+
+%files -f snapshot.lang
+%license LICENSE
+%license LICENSE.dependencies
+%if 0%{?bundled_rust_deps}
+%license cargo-vendor.txt
+%endif
+%doc README.md
+%{_bindir}/snapshot
+%{_datadir}/applications/org.gnome.Snapshot.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.Snapshot.gschema.xml
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Snapshot*.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Snapshot-symbolic.svg
+%{_datadir}/snapshot/
+%{_metainfodir}/org.gnome.Snapshot.metainfo.xml
+
+
+%changelog
+## 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
				`@ -0,0 +1 @@`
				`efe221021a372d7be390f117212d5190ef8f38f6 SOURCES/snapshot-45.2.tar.xz`