Hello community, here is the log from the commit of package tmux for openSUSE:Factory checked in at 2015-05-15 07:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tmux (Old) and /work/SRC/openSUSE:Factory/.tmux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tmux" Changes: -------- --- /work/SRC/openSUSE:Factory/tmux/tmux.changes 2015-05-10 10:46:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tmux.new/tmux.changes 2015-05-15 07:43:22.000000000 +0200 @@ -1,0 +2,16 @@ +Mon May 11 13:19:33 UTC 2015 - [email protected] + +- guard all systemd specific code in a bcond systemd. this includes + buildrequires, patching the socket path and the tmpfiles.d + handling +- actually add a buildrequires for pkgconfig so we can use that for + libraries +- allow building on older distros which do not have + pkgconfig(ncurses) yet by requiring ncurses-devel there. +- make sure we buildrequire libevent >= 2.0 as tmux requires that + since 1.9 +- expand the make_install macro to make it work on distros without + the macro +- expand tmpfiles_create macro as it isnt defined on sle12 e.g. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tmux.spec ++++++ --- /var/tmp/diff_new_pack.xwyJXD/_old 2015-05-15 07:43:23.000000000 +0200 +++ /var/tmp/diff_new_pack.xwyJXD/_new 2015-05-15 07:43:23.000000000 +0200 @@ -16,6 +16,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1230 +%bcond_without systemd +%else +%bcond_with systemd +%endif Name: tmux Version: 2.0 @@ -27,10 +32,18 @@ Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE tmux-socket-path.patch [email protected] -- Use /run/tmux instead of /tmp as the default socket path, this add some robustness against accidental deletion via systemd-tmpfiles-clean, tmpwatch, or similar Patch0: tmux-socket-path.patch +BuildRequires: pkgconfig +# TODO: if we want building on sle11 we would need to guard the next two lines with suse_version. but as the libevent there is too old skipping that for now. BuildRequires: utempter-devel -BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libevent) >= 2.0 +%if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(ncurses) +%else +BuildRequires: ncurses-devel +%endif +%if %{with systemd} BuildRequires: pkgconfig(systemd) +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,7 +60,9 @@ %prep %setup -q +%if %{with systemd} %patch0 -p1 +%endif %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -55,20 +70,23 @@ make %{?_smp_mflags} %install -%make_install +make install DESTDIR="%{buildroot}" +%if %{with systemd} mkdir -p %{buildroot}%{_tmpfilesdir} - printf 'd /run/tmux 1777 root root -' > %{buildroot}%{_tmpfilesdir}/tmux.conf %post -%{?tmpfiles_create:%tmpfiles_create %{_tmpfilesdir}/tmux.conf} +systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || true +%endif %files %defattr(-,root,root,-) %doc CHANGES FAQ TODO examples/ %{_mandir}/man1/tmux.1.* %{_bindir}/tmux +%if %{with systemd} %{_tmpfilesdir}/tmux.conf +%endif %changelog
