public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/tmux] rawhide: spec cleanup and modernization prep for next release [skip changelog]
@ 2026-06-23 17:27 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-06-23 17:27 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/tmux
            Branch : rawhide
            Commit : 7bddba2df210f3915711dfa328a2a3603e1b3dbf
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-20T21:04:41-03:00
            Stats  : +27/-17 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/tmux/c/7bddba2df210f3915711dfa328a2a3603e1b3dbf?branch=rawhide

            Log:
            spec cleanup and modernization prep for next release [skip changelog]

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/tmux.spec b/tmux.spec
index 6a229d1..34a0192 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -1,8 +1,6 @@
-%global _hardened_build 1
-
 Name:           tmux
 Version:        3.6b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A terminal multiplexer
 
 License:        ISC AND BSD-2-Clause AND BSD-3-Clause AND SSH-short AND LicenseRef-Fedora-Public-Domain
@@ -28,15 +26,21 @@ BuildRequires:  pkgconfig(ncursesw)
 BuildRequires:  automake
 %endif
 
+Requires(post):   coreutils
+Requires(post):   grep
+Requires(postun): sed
+
 %description
 tmux is a "terminal multiplexer."  It enables a number of terminals (or
 windows) to be accessed and controlled from a single terminal.  tmux is
 intended to be a simple, modern, BSD-licensed alternative to programs such
 as GNU Screen.
 
+
 %prep
 %autosetup
 
+
 %build
 %configure --enable-sixel --enable-systemd --enable-utempter
 %make_build
@@ -44,30 +48,33 @@ as GNU Screen.
 
 %install
 %make_install
-
 # Install the systemd file
 install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/tmux@.service
-
 # Install the polkit example file
 install -Dpm 644 %{SOURCE3} %{buildroot}%{_docdir}/tmux/README.polkit
 
+
+%check
+%{buildroot}%{_bindir}/tmux -V
+
+
 %post
+# Add login shell entries to /etc/shells only when installing the package
+# for the first time:
 if [ "$1" = 1 ]; then
-  if [ ! -f %{_sysconfdir}/shells ] ; then
-    touch %{_sysconfdir}/shells
+  if [ ! -f %{_sysconfdir}/shells ]; then
+    echo "%{_bindir}/tmux" > %{_sysconfdir}/shells
+    echo "/bin/tmux" >> %{_sysconfdir}/shells
+  else
+    grep -q "^%{_bindir}/tmux$" %{_sysconfdir}/shells || echo "%{_bindir}/tmux" >> %{_sysconfdir}/shells
+    grep -q "^/bin/tmux$" %{_sysconfdir}/shells || echo "/bin/tmux" >> %{_sysconfdir}/shells
   fi
-  for binpath in %{_bindir} /bin; do
-    if ! grep -q "^${binpath}/tmux$" %{_sysconfdir}/shells; then
-       (cat %{_sysconfdir}/shells; echo "$binpath/tmux") > %{_sysconfdir}/shells.new
-       mv %{_sysconfdir}/shells{.new,}
-    fi
-  done
 fi
 
 %postun
-if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then
-  sed -e '\!^%{_bindir}/tmux$!d' -e '\!^/bin/tmux$!d' < %{_sysconfdir}/shells > %{_sysconfdir}/shells.new
-  mv %{_sysconfdir}/shells{.new,}
+# Remove the login shell lines from /etc/shells only when uninstalling:
+if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ]; then
+  sed -i -e '\!^%{_bindir}/tmux$!d' -e '\!^/bin/tmux$!d' %{_sysconfdir}/shells
 fi
 
 %files
@@ -78,8 +85,11 @@ fi
 %{_unitdir}/tmux@.service
 
 %changelog
+* Sat Jun 20 2026 Filipe Rosset <filiperosset@fedoraproject.org> - 3.6b-2
+- spec cleanup and modernization in preparation for next release
+
 * Thu May 21 2026 Filipe Rosset <rosset.filipe@gmail.com> - 3.6b-1
-- updateo to 3.6b
+- update to 3.6b
 
 * Tue May 05 2026 Dridi Boukelmoune <dridi@fedoraproject.org> - 3.6a-2
 - Patch #{pane_current_path} race condition

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-23 17:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-23 17:27 [rpms/tmux] rawhide: spec cleanup and modernization prep for next release [skip changelog] Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox