From d41a81627c955a9b919a4378df75c88387e9095f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 17:41:51 -0500 Subject: [PATCH 01/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index da2e1c5..d4c00ce 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple Xembed container manager Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf %{buildroot} %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2fd0a4b803adfdb8dc3ae13248940de64f923963 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 19:15:00 -0600 Subject: [PATCH 02/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index d4c00ce..7a9b0a1 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple Xembed container manager Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From a15560993ae73051b9e5fff5576c222df4854a16 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 22:13:32 -0500 Subject: [PATCH 03/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 7a9b0a1..1bb4fc2 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple Xembed container manager Group: User Interface/X @@ -51,6 +51,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 217a0aef5738870ec9b92916b776b039ab3de569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 22 Jan 2014 12:41:26 +0100 Subject: [PATCH 04/35] Bumping to 0.6 - Adding README and TODO to %doc - Dropping the unneeded constructs - Tweaking the description a little bit --- .gitignore | 1 + sources | 2 +- tabbed.spec | 39 +++++++++++++-------------------------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 05ef856..97ec2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ tabbed-0.2.tar.gz +/tabbed-0.6.tar.gz diff --git a/sources b/sources index 09305e0..4ba7e5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc00ee1a9fd1478561b064cd6a53d494 tabbed-0.2.tar.gz +7898992feb9358e0196119750b77b42c tabbed-0.6.tar.gz diff --git a/tabbed.spec b/tabbed.spec index 1bb4fc2..f31d396 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,56 +1,43 @@ Name: tabbed -Version: 0.2 -Release: 7%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Simple Xembed container manager - Group: User Interface/X License: MIT URL: http://tools.suckless.org/tabbed Source0: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: libX11-devel - %description -tabbed is a simple generic fronted to xembed aware applications - +A simple generic fronted to xembed aware applications. %prep %setup -q - sed -e 's|/usr/local|%{_prefix}|g' \ -e 's|/usr/lib|%{_libdir}|g' \ - -e 's|-s ${LIBS}|-g ${LIBS}|g' \ - -e 's|-std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}|%{optflags} ${INCS} ${CPPFLAGS}|g' \ + -e 's|-std=c99 -pedantic -Wall -O0|%{optflags}|g' \ + -e 's|-s\b||' \ -i config.mk - sed -i 's!^\(\t\+\)@!\1!' Makefile - %build make %{?_smp_mflags} - %install -rm -rf %{buildroot} -make install \ - DESTDIR=%{buildroot} \ - INSTALL="install -p" - - -%clean -rm -rf %{buildroot} - +make install DESTDIR=%{buildroot} %files -%defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE README TODO %{_bindir}/%{name} %{_mandir}/man1/%{name}.* - %changelog +* Wed Jan 22 2014 Petr Šabata - 0.6-1 +- Bumping to 0.6 +- Adding README and TODO to %%doc +- Dropping the unneeded constructs +- Tweaking the description a little bit + * Sun Aug 04 2013 Fedora Release Engineering - 0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 0a8fcbf978255612f795151a5ecdb8228ec05b3b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:03:16 -0500 Subject: [PATCH 05/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index f31d396..2f09cb3 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Xembed container manager Group: User Interface/X License: MIT @@ -32,6 +32,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man1/%{name}.* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Jan 22 2014 Petr Šabata - 0.6-1 - Bumping to 0.6 - Adding README and TODO to %%doc From 7674d2fc49e4e6d24d4f9f241deac31feddc372e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 26 Jun 2014 16:16:26 +0200 Subject: [PATCH 06/35] Introduce the `user' subpackage --- tabbed-user | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ tabbed-user.1 | 54 ++++++++++++++++++++++++++++++ tabbed.spec | 70 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 tabbed-user create mode 100644 tabbed-user.1 diff --git a/tabbed-user b/tabbed-user new file mode 100644 index 0000000..9014313 --- /dev/null +++ b/tabbed-user @@ -0,0 +1,93 @@ +#!/bin/sh +# MIT/X Consortium License +# +# 2014 Petr Šabata +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +tool=tabbed +name=${tool}-user +version=VERSION +release=RELEASE +bindir=~/.${tool} +builddir=~/.${tool}-build +sources=/usr/src/${name}-${version}-${release} +config=${bindir}/config.h +modified=${bindir}/modified +buildver=${bindir}/version +patches=${bindir}/patches +patchmod=0 + +function run_custom { + echo "${name}: Running user ${tool}..." 1>&2 + ${bindir}/${tool} +} + +function run_system { + echo "${name}: Running system ${tool}..." 1>&2 + /usr/bin/${tool}-fedora +} + +function rebuild { + if [ ! -d ${sources} ]; then + echo "${name}: Cannot find sources in ${sources}. Not rebuilding." 1>&2 + else + echo "${name}: Rebuilding ${tool}..." 1>&2 + rm -rf ${builddir} + cp -R ${sources} ${builddir} + [ -f ${config} ] && cp ${config} ${builddir}/config.h + cd ${builddir} + if [ -d ${patches} ]; then + echo "${name}: Applying patches to ${tool}..." 1>&2 + find ${patches} -type f -name '*.diff' | sort | xargs -n1 patch -p1 -i + fi + make 2>&1 > ${builddir}/build.log + if [ "$?" -ne 0 ]; then + echo "${name}: Build failed. See ${builddir}/build.log for details." 1>&2 + else + echo "${name}: Build OK." 1>&2 + mv ${builddir}/${tool} ${bindir} + cd $HOME + rm -rf ${builddir} + echo $(stat -c %Y "${bindir}/${tool}") > ${modified} + echo "${version}-${release}" > ${buildver} + fi + fi +} + +mkdir -p ${bindir} +if [ -f ${config} -o -d ${patches} ]; then + if [ -d ${patches} ]; then + patchmod=$(find ${patches} -type f -name '*.diff' -exec stat -c %Y {} \; | sort -r | head -n 1) + if [ "${patchod}" = "" ]; then + patchmod=0 + fi + fi + configmod=$(stat -c %Y ${config}) + if [ "${configmod}" = "" ]; then + configmod=0 + fi + if [ ! -f ${modified} ] || [ "$(cat ${modified})" -lt "${configmod}" ] || + [ "$(cat ${modified})" -lt "${patchmod}" ] || [ ! -f ${buildver} ] || + [ "$(cat ${buildver})" != "${version}-${release}" ] || [ "$1" = '-f' ]; then + rebuild + fi +fi +[ -x ${bindir}/${tool} ] && run_custom || run_system diff --git a/tabbed-user.1 b/tabbed-user.1 new file mode 100644 index 0000000..46c53e6 --- /dev/null +++ b/tabbed-user.1 @@ -0,0 +1,54 @@ +.TH TABBED\-USER 1 tabbed\-user\-VERSION\-RELEASE +.SH NAME +tabbed\-user \- tabbed reconfiguration helper and launcher script +.SH SYNOPSIS +.B tabbed\-user +.SH DESCRIPTION +.BR tabbed\-user +is a helper script for running and reconfiguring +.BR tabbed +if neccessarry. +.P +Running +.BR tabbed\-user +starts the Fedora build by default. If you wish to customize your +configuration, put your +.BR tabbed +configuration header file to $HOME/.tabbed/config.h and adjust it according to +your needs. The official Fedora configuration file might be a useful template. +See the +.BR FILES +section of this manual. +.P +Every time the user configuration file has changed or new patches have +been added, +.BR tabbed\-user +will rebuild the user +.BR tabbed +binary prior to its execution. +.P +Fedora utilizes +.BR alternatives +to choose whether the system build, also installed as +.BR tabbed\-fedora , +or the custom build is run. If available, custom builds are preferred. +.SH FILES +.nf +$HOME/.tabbed + - User tabbed directory +$HOME/.tabbed/config.h + - User tabbed configuration +$HOME/.tabbed/patches + - Optional patches to apply +/usr/src/tabbed\-user\-VERSION\-RELEASE + - tabbed sources +/usr/src/tabbed\-VERSION\-RELEASE/config.def.h + - Fedora build configuration +.fi +.SH SEE ALSO +.BR tabbed (1) , +.BR update-alternatives (8) +.SH BUGS +Report bugs to Red Hat Bugzilla, http://bugzilla.redhat.com/ +.SH AUTHOR +Written by Petr Šabata , 2014. diff --git a/tabbed.spec b/tabbed.spec index 2f09cb3..8ee75df 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -2,14 +2,35 @@ Name: tabbed Version: 0.6 Release: 2%{?dist} Summary: Simple Xembed container manager + +%global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} + Group: User Interface/X License: MIT URL: http://tools.suckless.org/tabbed Source0: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz +Source1: %{name}-user +Source2: %{name}-user.1 BuildRequires: libX11-devel +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives + %description -A simple generic fronted to xembed aware applications. +A simple generic fronted to XEmbed aware applications. + +%package user +Summary: Tabbed sources and tools for user configuration +Group: User Interface/X +License: MIT +Requires: %{name} = %{version}-%{release} +Requires: gcc, make, patch, libX11-devel +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives + +%description user +Tabbed source files and a launcher/builder wrapper script for +customized configurations. %prep %setup -q @@ -25,13 +46,58 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} +mv %{buildroot}%{_bindir}/%{name}{,-fedora} +install -pm755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}-user +install -Dpm644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}-user.1 +for file in \ + %{buildroot}%{_bindir}/%{name}-user \ + %{buildroot}%{_mandir}/man1/%{name}-user.1; do +sed -i -e 's/VERSION/%{version}/' \ + -e 's/RELEASE/%{release}/' \ + ${file} +done +mkdir -p %{buildroot}%{_tabbedsourcedir} +install -m644 arg.h config.def.h config.mk Makefile tabbed.c \ + %{buildroot}%{_tabbedsourcedir} +touch %{buildroot}%{_bindir}/%{name} + +%pre +[ -L %{_bindir}/%{name} ] || rm -f %{_bindir}/%{name} + +%post +%{_sbindir}/update-alternatives --install %{_bindir}/%{name} %{name} \ + %{_bindir}/%{name}-fedora 10 + +%postun +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-fedora +fi + +%post user +%{_sbindir}/update-alternatives --install %{_bindir}/%{name} %{name} \ + %{_bindir}/%{name}-user 20 + +%postun user +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-user +fi %files %doc LICENSE README TODO -%{_bindir}/%{name} +%ghost %{_bindir}/%{name} +%{_bindir}/%{name}-fedora %{_mandir}/man1/%{name}.* +%files user +%ghost %{_bindir}/%{name} +%{_bindir}/%{name}-user +%{_mandir}/man1/%{name}-user.* +%{_tabbedsourcedir} + %changelog +* Wed Jun 25 2014 Petr Šabata - 0.6-2 +- Introduce the `user' subpackage + * Sun Jun 08 2014 Fedora Release Engineering - 0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c847ef921e3fd1309869434c07ad1007db5a6e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 26 Jun 2014 16:17:06 +0200 Subject: [PATCH 07/35] Require arch-specific base package --- tabbed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 8ee75df..2326f24 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -23,7 +23,7 @@ A simple generic fronted to XEmbed aware applications. Summary: Tabbed sources and tools for user configuration Group: User Interface/X License: MIT -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gcc, make, patch, libX11-devel Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives From 25b331e56e4c7ae8598f81eae8c07b7ba1c1fd76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 26 Jun 2014 16:18:20 +0200 Subject: [PATCH 08/35] Correct the release number --- tabbed.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tabbed.spec b/tabbed.spec index 2326f24..859bc00 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -95,7 +95,7 @@ fi %{_tabbedsourcedir} %changelog -* Wed Jun 25 2014 Petr Šabata - 0.6-2 +* Wed Jun 25 2014 Petr Šabata - 0.6-3 - Introduce the `user' subpackage * Sun Jun 08 2014 Fedora Release Engineering - 0.6-2 From 35a2c3f3a55f8a6df82e31306ff2fab7f3837c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 13 Aug 2014 11:15:40 +0200 Subject: [PATCH 09/35] Pass command line parameters to respective binaries in tabbed-user (#1129582) --- tabbed-user | 6 +++--- tabbed.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tabbed-user b/tabbed-user index 9014313..46636ca 100644 --- a/tabbed-user +++ b/tabbed-user @@ -37,12 +37,12 @@ patchmod=0 function run_custom { echo "${name}: Running user ${tool}..." 1>&2 - ${bindir}/${tool} + ${bindir}/${tool} $@ } function run_system { echo "${name}: Running system ${tool}..." 1>&2 - /usr/bin/${tool}-fedora + /usr/bin/${tool}-fedora $@ } function rebuild { @@ -90,4 +90,4 @@ if [ -f ${config} -o -d ${patches} ]; then rebuild fi fi -[ -x ${bindir}/${tool} ] && run_custom || run_system +[ -x ${bindir}/${tool} ] && run_custom $@ || run_system $@ diff --git a/tabbed.spec b/tabbed.spec index 859bc00..e489fc7 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -95,6 +95,9 @@ fi %{_tabbedsourcedir} %changelog +* Wed Aug 13 2014 Petr Šabata - 0.6-4 +- Pass command line parameters to respective binaries in tabbed-user (#1129582) + * Wed Jun 25 2014 Petr Šabata - 0.6-3 - Introduce the `user' subpackage From f6b5be42f68bf45342b90df861e3f16e5c7b8d6e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 04:43:16 +0000 Subject: [PATCH 10/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index e489fc7..094b778 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -95,6 +95,9 @@ fi %{_tabbedsourcedir} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 13 2014 Petr Šabata - 0.6-4 - Pass command line parameters to respective binaries in tabbed-user (#1129582) From 76cb641f14dd5bedd575216aca12b2950b7fb322 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:26:17 +0000 Subject: [PATCH 11/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 094b778..0ea4987 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -95,6 +95,9 @@ fi %{_tabbedsourcedir} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 08899a4e5d38749d6da7554e0f153f9ed19f86eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 17 Sep 2015 22:58:18 +0200 Subject: [PATCH 12/35] Enable full RELRO - Correct the dep list --- tabbed.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tabbed.spec b/tabbed.spec index 0ea4987..14edc29 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -11,7 +11,12 @@ URL: http://tools.suckless.org/tabbed Source0: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz Source1: %{name}-user Source2: %{name}-user.1 +BuildRequires: binutils +BuildRequires: coreutils +BuildRequires: gcc BuildRequires: libX11-devel +BuildRequires: make +BuildRequires: sed Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -24,7 +29,14 @@ Summary: Tabbed sources and tools for user configuration Group: User Interface/X License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gcc, make, patch, libX11-devel +Requires: binutils +Requires: coreutils +Requires: findutils +Requires: gcc +Requires: libX11-devel +Requires: make +Requires: patch +Requires: sed Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -38,6 +50,7 @@ sed -e 's|/usr/local|%{_prefix}|g' \ -e 's|/usr/lib|%{_libdir}|g' \ -e 's|-std=c99 -pedantic -Wall -O0|%{optflags}|g' \ -e 's|-s\b||' \ + -e 's|\(${LIBS}\)|\1 %{?__global_ldflags}|' \ -i config.mk sed -i 's!^\(\t\+\)@!\1!' Makefile @@ -95,6 +108,10 @@ fi %{_tabbedsourcedir} %changelog +* Thu Sep 17 2015 Petr Šabata - 0.6-7 +- Enable full RELRO +- Correct the dep list + * Fri Jun 19 2015 Fedora Release Engineering - 0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bbcf6b57a94f5f20dc85fc31d79244bdcacbc0cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 01:13:48 +0000 Subject: [PATCH 13/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 14edc29..78f1fed 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -108,6 +108,9 @@ fi %{_tabbedsourcedir} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Sep 17 2015 Petr Šabata - 0.6-7 - Enable full RELRO - Correct the dep list From 2593030deeb0e7bbc33ac7bf14bc58cf2eda8f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 12 Aug 2016 10:59:54 +0200 Subject: [PATCH 14/35] The user subpackage now properly requires redhat-rpm-config --- tabbed.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 78f1fed..03c2dd5 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -36,6 +36,7 @@ Requires: gcc Requires: libX11-devel Requires: make Requires: patch +Requires: redhat-rpm-config Requires: sed Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -108,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Fri Aug 12 2016 Petr Šabata - 0.6-9 +- The user subpackage now properly requires redhat-rpm-config + * Fri Feb 05 2016 Fedora Release Engineering - 0.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 7cbf95f9a812ae9976f386d8dc70f4ca58a14d9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 15:31:17 +0000 Subject: [PATCH 15/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 03c2dd5..185dcf9 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -109,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Aug 12 2016 Petr Šabata - 0.6-9 - The user subpackage now properly requires redhat-rpm-config From 6b6d8f462c6ca1864cf5e2f54146c8f61f3419b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 19:53:50 +0000 Subject: [PATCH 16/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 185dcf9..632fdc6 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -109,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ebb806413f8cc4bb9445a9a117fefcd2e75a3596 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:07:48 +0000 Subject: [PATCH 17/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 632fdc6..0d22c03 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -109,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c9d3a86bc4e24977ad254b6af754e46dc6e84aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:24:19 +0000 Subject: [PATCH 18/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 0d22c03..a17ce08 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -109,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 441da972ee804bb3af34985921c7062308dab83b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:13:38 +0000 Subject: [PATCH 19/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index a17ce08..1731f2e 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -109,6 +109,9 @@ fi %{_tabbedsourcedir} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3edbc1ec5d3095332097591de2c85e6f3b4568f6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:27 +0100 Subject: [PATCH 20/35] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- tabbed.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tabbed.spec b/tabbed.spec index 1731f2e..5b4871b 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,6 @@ Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} -Group: User Interface/X License: MIT URL: http://tools.suckless.org/tabbed Source0: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz @@ -26,7 +25,6 @@ A simple generic fronted to XEmbed aware applications. %package user Summary: Tabbed sources and tools for user configuration -Group: User Interface/X License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: binutils From da11dbfb8c8e7c495e909d466a02aa182ccef2c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:20:44 +0000 Subject: [PATCH 21/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 5b4871b..af3d9f0 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 62400b648079b5df04613d40687606bf64723970 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 00:56:18 +0000 Subject: [PATCH 22/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index af3d9f0..7af6e75 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ed45374c4f2c47fe7411a92a8557e3b4820345ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:01:15 +0000 Subject: [PATCH 23/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 7af6e75..01a5749 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6229225dd2ce1cb708d30f6aac416aa80de99997 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:02:40 +0000 Subject: [PATCH 24/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 01a5749..352a07e 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 6698c5be2d474adfe8611606e713891ebf8c3a41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:33:45 +0000 Subject: [PATCH 25/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 352a07e..007938f 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 618533fecb397d78f26bff51923818b87bb37740 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:49:47 +0000 Subject: [PATCH 26/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 007938f..d4f1b90 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 34310de9e2eb3d6482ef3cc2d49e17adfc456e88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:14:48 +0000 Subject: [PATCH 27/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index d4f1b90..cc9b4a3 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 2777bc0b00dc68feb591dcdf52a7c7b228f73cae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:02:04 +0000 Subject: [PATCH 28/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index cc9b4a3..972fb07 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -1,6 +1,6 @@ Name: tabbed Version: 0.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -107,6 +107,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 625345ba39ff9e664076055c2e72b5f6a59eb22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 16 Jan 2023 23:37:15 +0100 Subject: [PATCH 29/35] 0.7 bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applies workaround for the F36 FTBFS, includes a new simple xembed wrapper utility, and now uses an SPDX license identifier (no-op in this particular case). Signed-off-by: Petr Šabata --- .gitignore | 1 + sources | 2 +- tabbed.spec | 34 +++++++++++++++++++++++++++++----- xembed.1 | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 xembed.1 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 972fb07..5bcd263 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: 22%{?dist} +Version: 0.7 +Release: 1%{?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,14 @@ fi %{_tabbedsourcedir} %changelog +* 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 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. From b5cfb6cf86586973d308d090c175b91960464086 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:35:56 +0000 Subject: [PATCH 30/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 5bcd263..6b4748b 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From e7d992ae01edb4ad16e1289faabb2e28623bebdd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:07:51 +0000 Subject: [PATCH 31/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 6b4748b..f2698dc 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 9d297ebbfc41c66dbb2e1a8315a92ab570ad1217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:16:28 +0000 Subject: [PATCH 32/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index f2698dc..5859b93 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 9449b76b0fc87c0332c6e996c5e3113ed048ad0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:00:40 +0000 Subject: [PATCH 33/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 5859b93..95380a3 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 68b3f890085702072d76e83d3ba0bc1379cefaf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:17:53 +0000 Subject: [PATCH 34/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index 95380a3..f3c135a 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ fi %{_tabbedsourcedir} %changelog +* 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 From 410ec2ccda364633db2766b2ab54362f5ffe7ede Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:03:30 +0000 Subject: [PATCH 35/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- tabbed.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabbed.spec b/tabbed.spec index f3c135a..1b54fc5 100644 --- a/tabbed.spec +++ b/tabbed.spec @@ -5,7 +5,7 @@ Name: tabbed Version: 0.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple Xembed container manager %global _tabbedsourcedir %{_usrsrc}/tabbed-user-%{version}-%{release} @@ -123,6 +123,9 @@ 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