rpms/gnome-tour
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable bundled deps in RHEL builds

Browse Source 
Also, only use Fedora branding in Fedora builds
This commit is contained in:
Yaakov Selkowitz 2023-04-27 15:13:56 -04:00
parent 72e652e287
commit e81a10e89d
1 changed files with 83 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
gnome-tour.spec
View File

@ -1,6 +1,10 @@
# Use bundled deps as we don't ship the exact right versions for all the # Use bundled deps as we don't ship the exact right versions for all the
# required rust libraries # required rust libraries
%if 0%{?rhel}
%global bundled_rust_deps 1
%else
%global bundled_rust_deps 0 %global bundled_rust_deps 0
%endif
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
@ -10,7 +14,7 @@
Name: gnome-tour Name: gnome-tour
Version: 44.0 Version: 44.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: GNOME Tour and Greeter Summary: GNOME Tour and Greeter
# * gnome-tour source code is GPLv3+ # * gnome-tour source code is GPLv3+
@ -38,94 +42,97 @@ BuildRequires: rust-packaging
%endif %endif
%if 0%{?bundled_rust_deps} %if 0%{?bundled_rust_deps}
# bundled crates list updated for gnome-tour 42.beta # bundled crates list updated for gnome-tour 44
Provides: bundled(crate(aho-corasick/default)) = 0.7.18 Provides: bundled(crate(aho-corasick/default)) = 0.7.20
Provides: bundled(crate(anyhow/default)) = 1.0.53 Provides: bundled(crate(anyhow/default)) = 1.0.70
Provides: bundled(crate(atty/default)) = 0.2.14 Provides: bundled(crate(atty/default)) = 0.2.14
Provides: bundled(crate(autocfg/default)) = 1.0.1 Provides: bundled(crate(autocfg/default)) = 1.1.0
Provides: bundled(crate(bitflags/default)) = 1.3.2 Provides: bundled(crate(bitflags/default)) = 1.3.2
Provides: bundled(crate(block/default)) = 0.1.6 Provides: bundled(crate(block/default)) = 0.1.6
Provides: bundled(crate(cairo-rs/default)) = 0.15.1 Provides: bundled(crate(cairo-rs/default)) = 0.17.0
Provides: bundled(crate(cairo-sys-rs/default)) = 0.15.1 Provides: bundled(crate(cairo-sys-rs/default)) = 0.17.0
Provides: bundled(crate(cc/default)) = 1.0.72 Provides: bundled(crate(cc/default)) = 1.0.79
Provides: bundled(crate(cfg-expr/default)) = 0.9.0 Provides: bundled(crate(cfg-expr/default)) = 0.11.0
Provides: bundled(crate(cfg-if/default)) = 1.0.0 Provides: bundled(crate(cfg-if/default)) = 1.0.0
Provides: bundled(crate(env_logger/default)) = 0.7.1 Provides: bundled(crate(env_logger/default)) = 0.7.1
Provides: bundled(crate(field-offset/default)) = 0.3.4 Provides: bundled(crate(field-offset/default)) = 0.3.5
Provides: bundled(crate(futures-channel/default)) = 0.3.19 Provides: bundled(crate(futures-channel/default)) = 0.3.27
Provides: bundled(crate(futures-core/default)) = 0.3.19 Provides: bundled(crate(futures-core/default)) = 0.3.27
Provides: bundled(crate(futures-executor/default)) = 0.3.19 Provides: bundled(crate(futures-executor/default)) = 0.3.27
Provides: bundled(crate(futures-io/default)) = 0.3.19 Provides: bundled(crate(futures-io/default)) = 0.3.27
Provides: bundled(crate(futures-task/default)) = 0.3.19 Provides: bundled(crate(futures-macro/default)) = 0.3.27
Provides: bundled(crate(futures-util/default)) = 0.3.19 Provides: bundled(crate(futures-task/default)) = 0.3.27
Provides: bundled(crate(gdk4/default)) = 0.4.4 Provides: bundled(crate(futures-util/default)) = 0.3.27
Provides: bundled(crate(gdk-pixbuf/default)) = 0.15.1 Provides: bundled(crate(gdk-pixbuf/default)) = 0.17.0
Provides: bundled(crate(gdk-pixbuf-sys/default)) = 0.15.1 Provides: bundled(crate(gdk-pixbuf-sys/default)) = 0.17.0
Provides: bundled(crate(gdk4-sys/default)) = 0.4.2 Provides: bundled(crate(gdk4/default)) = 0.6.3
Provides: bundled(crate(gdk4-sys/default)) = 0.6.3
Provides: bundled(crate(gettext-rs/default)) = 0.7.0 Provides: bundled(crate(gettext-rs/default)) = 0.7.0
Provides: bundled(crate(gettext-sys/default)) = 0.21.2 Provides: bundled(crate(gettext-sys/default)) = 0.21.3
Provides: bundled(crate(gio/default)) = 0.15.3 Provides: bundled(crate(gio/default)) = 0.17.4
Provides: bundled(crate(gio-sys/default)) = 0.15.1 Provides: bundled(crate(gio-sys/default)) = 0.17.4
Provides: bundled(crate(glib/default)) = 0.15.3 Provides: bundled(crate(glib/default)) = 0.17.5
Provides: bundled(crate(glib-macros/default)) = 0.15.3 Provides: bundled(crate(glib-macros/default)) = 0.17.5
Provides: bundled(crate(glib-sys/default)) = 0.15.1 Provides: bundled(crate(glib-sys/default)) = 0.17.4
Provides: bundled(crate(gobject-sys/default)) = 0.15.1 Provides: bundled(crate(gobject-sys/default)) = 0.17.4
Provides: bundled(crate(graphene-rs/default)) = 0.15.1 Provides: bundled(crate(graphene-rs/default)) = 0.17.1
Provides: bundled(crate(graphene-sys/default)) = 0.15.1 Provides: bundled(crate(graphene-sys/default)) = 0.17.0
Provides: bundled(crate(gsk4/default)) = 0.4.4 Provides: bundled(crate(gsk4/default)) = 0.6.3
Provides: bundled(crate(gsk4-sys/default)) = 0.4.2 Provides: bundled(crate(gsk4-sys/default)) = 0.6.3
Provides: bundled(crate(gtk4/default)) = 0.4.5 Provides: bundled(crate(gtk4/default)) = 0.6.4
Provides: bundled(crate(gtk4-macros/default)) = 0.4.3 Provides: bundled(crate(gtk4-macros/default)) = 0.6.3
Provides: bundled(crate(gtk4-sys/default)) = 0.4.5 Provides: bundled(crate(gtk4-sys/default)) = 0.6.3
Provides: bundled(crate(heck/default)) = 0.3.3 Provides: bundled(crate(hashbrown/default)) = 0.12.3
Provides: bundled(crate(heck/default)) = 0.4.0 Provides: bundled(crate(heck/default)) = 0.4.1
Provides: bundled(crate(hermit-abi/default)) = 0.1.19
Provides: bundled(crate(humantime/default)) = 1.3.0 Provides: bundled(crate(humantime/default)) = 1.3.0
Provides: bundled(crate(indexmap/default)) = 1.9.2
Provides: bundled(crate(lazy_static/default)) = 1.4.0 Provides: bundled(crate(lazy_static/default)) = 1.4.0
Provides: bundled(crate(libc/default)) = 0.2.74 Provides: bundled(crate(libadwaita/default)) = 0.3.1
Provides: bundled(crate(libadwaita/default)) = 0.1.0 Provides: bundled(crate(libadwaita-sys/default)) = 0.3.0
Provides: bundled(crate(libadwaita-sys/default)) = 0.1.0 Provides: bundled(crate(libc/default)) = 0.2.140
Provides: bundled(crate(libc/default)) = 0.2.114
Provides: bundled(crate(locale_config/default)) = 0.3.0 Provides: bundled(crate(locale_config/default)) = 0.3.0
Provides: bundled(crate(log/default)) = 0.4.14 Provides: bundled(crate(log/default)) = 0.4.17
Provides: bundled(crate(malloc_buf/default)) = 0.0.6 Provides: bundled(crate(malloc_buf/default)) = 0.0.6
Provides: bundled(crate(memchr/default)) = 2.4.1 Provides: bundled(crate(memchr/default)) = 2.5.0
Provides: bundled(crate(memoffset/default)) = 0.6.5 Provides: bundled(crate(memoffset/default)) = 0.8.0
Provides: bundled(crate(objc/default)) = 0.2.7 Provides: bundled(crate(objc/default)) = 0.2.7
Provides: bundled(crate(objc-foundation/default)) = 0.1.1 Provides: bundled(crate(objc-foundation/default)) = 0.1.1
Provides: bundled(crate(objc_id/default)) = 0.1.1 Provides: bundled(crate(objc_id/default)) = 0.1.1
Provides: bundled(crate(pango/default)) = 0.15.2 Provides: bundled(crate(once_cell/default)) = 1.17.1
Provides: bundled(crate(pango-sys/default)) = 0.15.1 Provides: bundled(crate(pango/default)) = 0.17.4
Provides: bundled(crate(pest/default)) = 2.1.3 Provides: bundled(crate(pango-sys/default)) = 0.17.0
Provides: bundled(crate(pin-project-lite/default)) = 0.2.8 Provides: bundled(crate(pin-project-lite/default)) = 0.2.9
Provides: bundled(crate(pin-utils/default)) = 0.1.0 Provides: bundled(crate(pin-utils/default)) = 0.1.0
Provides: bundled(crate(pkg-config/default)) = 0.3.24 Provides: bundled(crate(pkg-config/default)) = 0.3.26
Provides: bundled(crate(pretty_env_logger/default)) = 0.4.0 Provides: bundled(crate(pretty_env_logger/default)) = 0.4.0
Provides: bundled(crate(proc-macro-crate/default)) = 1.1.0 Provides: bundled(crate(proc-macro-crate/default)) = 1.3.1
Provides: bundled(crate(proc-macro-error/default)) = 1.0.4 Provides: bundled(crate(proc-macro-error/default)) = 1.0.4
Provides: bundled(crate(proc-macro-error-attr/default)) = 1.0.4 Provides: bundled(crate(proc-macro-error-attr/default)) = 1.0.4
Provides: bundled(crate(proc-macro2/default)) = 1.0.36 Provides: bundled(crate(proc-macro2/default)) = 1.0.52
Provides: bundled(crate(quick-error/default)) = 1.2.3 Provides: bundled(crate(quick-error/default)) = 1.2.3
Provides: bundled(crate(quote/default)) = 1.0.15 Provides: bundled(crate(quote/default)) = 1.0.26
Provides: bundled(crate(regex/default)) = 1.5.4 Provides: bundled(crate(regex/default)) = 1.7.1
Provides: bundled(crate(regex-syntax/default)) = 0.6.25 Provides: bundled(crate(regex-syntax/default)) = 0.6.28
Provides: bundled(crate(rustc_version/default)) = 0.3.3 Provides: bundled(crate(rustc_version/default)) = 0.4.0
Provides: bundled(crate(semver/default)) = 0.11.0 Provides: bundled(crate(semver/default)) = 1.0.17
Provides: bundled(crate(semver-parser/default)) = 0.10.2 Provides: bundled(crate(serde/default)) = 1.0.157
Provides: bundled(crate(serde/default)) = 1.0.136 Provides: bundled(crate(slab/default)) = 0.4.8
Provides: bundled(crate(slab/default)) = 0.4.5 Provides: bundled(crate(smallvec/default)) = 1.10.0
Provides: bundled(crate(smallvec/default)) = 1.8.0 Provides: bundled(crate(syn/default)) = 1.0.109
Provides: bundled(crate(syn/default)) = 1.0.86 Provides: bundled(crate(syn/default)) = 2.0.2
Provides: bundled(crate(system-deps/default)) = 6.0.0 Provides: bundled(crate(system-deps/default)) = 6.0.3
Provides: bundled(crate(temp-dir/default)) = 0.1.11 Provides: bundled(crate(temp-dir/default)) = 0.1.11
Provides: bundled(crate(termcolor/default)) = 1.1.2 Provides: bundled(crate(termcolor/default)) = 1.2.0
Provides: bundled(crate(thiserror/default)) = 1.0.30 Provides: bundled(crate(thiserror/default)) = 1.0.40
Provides: bundled(crate(thiserror-impl/default)) = 1.0.30 Provides: bundled(crate(thiserror-impl/default)) = 1.0.40
Provides: bundled(crate(toml/default)) = 0.5.8 Provides: bundled(crate(toml/default)) = 0.5.11
Provides: bundled(crate(ucd-trie/default)) = 0.1.3 Provides: bundled(crate(toml_datetime/default)) = 0.6.1
Provides: bundled(crate(unicode-segmentation/default)) = 1.8.0 Provides: bundled(crate(toml_edit/default)) = 0.19.7
Provides: bundled(crate(unicode-xid/default)) = 0.2.2 Provides: bundled(crate(unicode-ident/default)) = 1.0.8
Provides: bundled(crate(version-compare/default)) = 0.1.0 Provides: bundled(crate(version-compare/default)) = 0.1.1
Provides: bundled(crate(version_check/default)) = 0.9.4 Provides: bundled(crate(version_check/default)) = 0.9.4
Provides: bundled(crate(winnow/default)) = 0.3.6
%endif %endif
%description %description
@ -135,8 +142,10 @@ A guided tour and greeter for GNOME.
%prep %prep
%autosetup -p1 -n %{name}-%{tarball_version} %autosetup -p1 -n %{name}-%{tarball_version}
%if 0%{?fedora}
# Install Fedora branding # Install Fedora branding
install -p %{SOURCE1} data/resources/assets/welcome.svg install -p %{SOURCE1} data/resources/assets/welcome.svg
%endif
%if ! 0%{?bundled_rust_deps} %if ! 0%{?bundled_rust_deps}
sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
@ -186,6 +195,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des
%changelog %changelog
* Thu Apr 27 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 44.0-2
- Enable bundled deps in RHEL builds
- Update bundled provides
- Only use Fedora branding in Fedora builds
* Tue Mar 21 2023 David King <amigadave@amigadave.com> - 44.0-1 * Tue Mar 21 2023 David King <amigadave@amigadave.com> - 44.0-1
- Update to 44.0 - Update to 44.0