diff --git a/.gitignore b/.gitignore index 97ec2d6..d7d45ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tabbed-0.2.tar.gz /tabbed-0.6.tar.gz +/tabbed-0.7.tar.gz diff --git a/sources b/sources index 4ba7e5a..5c7e79b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7898992feb9358e0196119750b77b42c tabbed-0.6.tar.gz +SHA512 (tabbed-0.7.tar.gz) = 770420935fd152e10bef59e29eeb8125ee181993691c6c5f03baf311bd685c2b5f0ded13854b3715cc60d0f1ae99eceacd3e6cb7e4008c34917ae55c38b436a7 diff --git a/tabbed.spec b/tabbed.spec index 01a5749..1b54fc5 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,11 @@ +# XXX: Drop once f36 goes EOL +%if 0%{?fedora} == 036 +%undefine _package_note_file +%endif + Name: tabbed -Version: 0.6 -Release: 17%{?dist} +Version: 0.7 +Release: 7%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -10,10 +15,15 @@ URL: http://tools.suckless.org/tabbed Source0: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz Source1: %{name}-user Source2: %{name}-user.1 +# Upstream tarball doesn't include the xembed manpage in 0.6; taken from +# the git repository (fixed in 910e67db). +Source3: xembed.1 BuildRequires: binutils BuildRequires: coreutils +BuildRequires: fontconfig-devel BuildRequires: gcc BuildRequires: libX11-devel +BuildRequires: libXft-devel BuildRequires: make BuildRequires: sed Requires(post): %{_sbindir}/update-alternatives @@ -30,8 +40,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: binutils Requires: coreutils Requires: findutils +Requires: fontconfig-devel Requires: gcc Requires: libX11-devel +Requires: libXft-devel Requires: make Requires: patch Requires: redhat-rpm-config @@ -45,9 +57,11 @@ customized configurations. %prep %setup -q +# XXX: To be dropped with 0.8+ +cp %{SOURCE3} . sed -e 's|/usr/local|%{_prefix}|g' \ -e 's|/usr/lib|%{_libdir}|g' \ - -e 's|-std=c99 -pedantic -Wall -O0|%{optflags}|g' \ + -e 's|-std=c99 -pedantic -Wall -Os|%{optflags}|g' \ -e 's|-s\b||' \ -e 's|\(${LIBS}\)|\1 %{?__global_ldflags}|' \ -i config.mk @@ -69,7 +83,7 @@ sed -i -e 's/VERSION/%{version}/' \ ${file} done mkdir -p %{buildroot}%{_tabbedsourcedir} -install -m644 arg.h config.def.h config.mk Makefile tabbed.c \ +install -m644 arg.h config.def.h config.mk Makefile tabbed.c xembed.c \ %{buildroot}%{_tabbedsourcedir} touch %{buildroot}%{_bindir}/%{name} @@ -95,10 +109,12 @@ if [ $1 -eq 0 ] ; then fi %files -%doc LICENSE README TODO +%doc LICENSE README %ghost %{_bindir}/%{name} %{_bindir}/%{name}-fedora +%{_bindir}/xembed %{_mandir}/man1/%{name}.* +%{_mandir}/man1/xembed.* %files user %ghost %{_bindir}/%{name} @@ -107,6 +123,47 @@ fi %{_tabbedsourcedir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Petr Šabata - 0.7-1 +- 0.7 bump +- Now includes the xembed utility; as xembed has no implicit support for + config.def, this release doesn't include xembed customization via the user + subpackage; however, this could be improved in the future +- Adding a temporary workaround for F36 builds +- SPDX migration + +* Sat Jul 23 2022 Fedora Release Engineering - 0.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/xembed.1 b/xembed.1 new file mode 100644 index 0000000..5b0c28c --- /dev/null +++ b/xembed.1 @@ -0,0 +1,35 @@ +.TH XEMBED 1 tabbed\-VERSION +.SH NAME +xembed \- XEmbed foreground process +.SH SYNOPSIS +.B xembed +.I flag command +.RI [ "argument ..." ] +.SH DESCRIPTION +If the environment variable XEMBED is set, and +.B xembed +is in the foreground of its controlling tty, it will execute +.IP +command flag $XEMBED [argument ...] +.LP +Otherwise it will execute +.IP +command [argument ...] +.LP +.SH EXAMPLE +In a terminal emulator within a +.B tabbed +session, the shell alias +.IP +$ alias surf='xembed -e surf' +.LP +will cause `surf' to open in a new tab, unless it is run in the background, +i.e. `surf &', in which case it will instead open in a new window. +.SH AUTHORS +See the LICENSE file for the authors. +.SH LICENSE +See the LICENSE file for the terms of redistribution. +.SH SEE ALSO +.BR tabbed (1) +.SH BUGS +Please report them.