[rpms/gdb] gdb-17.2-rebase-f44: Switch to using the dist_name macro for distribution

[rpms/gdb] gdb-17.2-rebase-f44: Switch to using the dist_name macro for distribution

[Amit Shah]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : ddf8291871cef42e8a724e36417e8cdf7088ffe1
            Author : Amit Shah <amitshah@fedoraproject.org>
            Date   : 2022-07-28T06:54:17+00:00
            Stats  : +6/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/ddf8291871cef42e8a724e36417e8cdf7088ffe1?branch=gdb-17.2-rebase-f44

            Log:
            Switch to using the dist_name macro for distribution

The new dist_vendor macro[1] in fedora-release helps simplify spec files
by removing the conditionals for populating the distro.

[1] https://src.fedoraproject.org/rpms/fedora-release/pull-request/223

---
diff --git a/gdb.spec b/gdb.spec
index 361e1aa..57fca98 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -50,7 +50,7 @@ Version: 12.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -512,13 +512,9 @@ find -name "*.info*"|xargs rm -f
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej" # Should not happen.
 
-# Change the version that gets printed at GDB startup, so it is RH specific.
+# Change the version that gets printed at GDB startup, so it is distro-specific.
 cat > gdb/version.in << _FOO
-%if 0%{!?rhel:1}
-Fedora %{version}-%{release}
-%else # !0%{!?rhel:1} 
-Red Hat Enterprise Linux %{version}-%{release}
-%endif # !0%{!?rhel:1} 
+%{?dist_name} %{version}-%{release}
 _FOO
 
 # Remove the info and other generated files added by the FSF release
@@ -1192,6 +1188,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 28 2022 Amit Shah <amitshah@fedoraproject.org> - 12.1-5
+- Use the dist_name macro to identify the distribution
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild