From c80abd67abd8db97046cc80378f0ee61f871658f2217b554f46bbdb46b370c6f Mon Sep 17 00:00:00 2001
From: JL K <opensuse@jlk.one>
Date: Sat, 17 Jun 2023 11:55:53 +0000
Subject: [PATCH] Accepting request 1093543 from
 home:luc14n0:branches:X11:terminals

Add terminfo db entry; break long lines to make spec more readable; and update README.suse-maint

OBS-URL: https://build.opensuse.org/request/show/1093543
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/alacritty?expand=0&rev=68
---
 README.suse-maint | 24 ++++++++++++++++++++----
 alacritty.changes | 11 +++++++++++
 alacritty.spec    | 27 +++++++++++++++++----------
 3 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/README.suse-maint b/README.suse-maint
index 9958b78..d8a0163 100644
--- a/README.suse-maint
+++ b/README.suse-maint
@@ -1,6 +1,22 @@
-To rebuild the source tarball, run:
+To update this package to a new upstream release, run:
 
-$ osc service manualrun tar_scm
-$ osc service manualrun recompress
+$ current_version=$(ls alacritty-*.tar.xz)
+$ osc service disabledrun
+
+This should be enough do make a tarball out of the GitHub source tree AND
+vendor all the needed Rust crates. If the cargo-audit source service detect
+some bad enough vulnerability and give you the red light go visit
+https://github.com/openSUSE/obs-service-cargo_audit to further instructions,
+and/or contact the Alacritty maintainers.
+
+Otherwise you should be good to go:
+
+$ rm ${current_version}; osc addremove
+
+# If you have the power to build locally:
+$ osc build
+
+$ new_version=$(ls alacritty-*.tar.xz)
+$ osc ci -m "Update to ${new_version} release"
+$ osc sr -m "Update to ${new_version} release"
 
-You must also vendor the cargo dependencies.
diff --git a/alacritty.changes b/alacritty.changes
index 94759bf..587ddea 100644
--- a/alacritty.changes
+++ b/alacritty.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 16 23:24:35 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Install forgotten terminfo database entry, so software can have
+  access to information about Alacritty's capabilities.
+- Drop no longer needed rustflags/RUSTFLAGS macro/variable
+  definition in spec file, as the macros provided by
+  cargo-packaging already define and make use of them for us.
+- Update README.suse-maint to show newcomers how to update the
+  package with current sensible packaging practices.
+
 -------------------------------------------------------------------
 Mon May 29 12:21:42 UTC 2023 - Jan-Luca Kiok <opensuse-packages@jlk.one>
 
diff --git a/alacritty.spec b/alacritty.spec
index 5f08255..47f58a2 100644
--- a/alacritty.spec
+++ b/alacritty.spec
@@ -16,8 +16,6 @@
 #
 
 
-%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
-
 Name:           alacritty
 Version:        0.12.1
 Release:        0
@@ -84,7 +82,7 @@ sed -i -e 's#"config.guess":"e0c1d7ef8ce964fb57c35e7704ae8661d7e4ca87d6a3c18950e
 %endif
 
 %build
-RUSTFLAGS=%{rustflags} %{cargo_build}
+%{cargo_build}
 
 %install
 mkdir -p "%{buildroot}%{_bindir}"
@@ -94,19 +92,27 @@ install -D -m 0755 target/release/alacritty %{buildroot}%{_bindir}/alacritty
 rm -fr %{buildroot}%{_datadir}
 
 # install man page and completions
-install -Dm 0644 extra/linux/Alacritty.desktop %{buildroot}/%{_datadir}/applications/Alacritty.desktop
-install -Dm 0644 extra/logo/alacritty-simple.svg %{buildroot}/%{_datadir}/pixmaps/Alacritty.svg
+install -Dm 0644 extra/linux/Alacritty.desktop \
+    %{buildroot}/%{_datadir}/applications/Alacritty.desktop
+install -Dm 0644 extra/logo/alacritty-simple.svg \
+    %{buildroot}/%{_datadir}/pixmaps/Alacritty.svg
 install -Dm 0644 extra/linux/org.alacritty.Alacritty.appdata.xml \
-                 %{buildroot}/%{_datadir}/appdata/org.alacritty.Alacritty.appdata.xml
+    %{buildroot}/%{_datadir}/appdata/org.alacritty.Alacritty.appdata.xml
 install -Dm 0644 extra/%{name}.man %{buildroot}/%{_mandir}/man1/%{name}.1
-install -Dm 0644 extra/completions/%{name}.bash %{buildroot}/%{_datadir}/bash-completion/completions/%{name}
-install -Dm 0644 extra/completions/%{name}.fish %{buildroot}/%{_datadir}/fish/vendor_completions.d/%{name}.fish
-install -Dm 0644 extra/completions/_%{name}  %{buildroot}/%{_datadir}/zsh/site-functions/_%{name}
+install -Dm 0644 extra/completions/%{name}.bash \
+    %{buildroot}/%{_datadir}/bash-completion/completions/%{name}
+install -Dm 0644 extra/completions/%{name}.fish \
+    %{buildroot}/%{_datadir}/fish/vendor_completions.d/%{name}.fish
+install -Dm 0644 extra/completions/_%{name} \
+    %{buildroot}/%{_datadir}/zsh/site-functions/_%{name}
+# Don't forget the terminfo entry
+install -Dm 0644 extra/alacritty.info \
+    %{buildroot}%{_datadir}/terminfo/a/%{name}
 
 # install desktop file
 %suse_update_desktop_file Alacritty
 
-%fdupes %{buildroot}
+%fdupes %{buildroot}%{_datadir}
 
 %files
 %license LICENSE-APACHE
@@ -116,6 +122,7 @@ install -Dm 0644 extra/completions/_%{name}  %{buildroot}/%{_datadir}/zsh/site-f
 %{_datadir}/applications/Alacritty.desktop
 %{_datadir}/pixmaps/Alacritty.svg
 %{_datadir}/appdata/org.alacritty.Alacritty.appdata.xml
+%{_datadir}/terminfo/a/%{name}
 
 %files bash-completion
 %{_datadir}/bash-completion