Hello community, here is the log from the commit of package multitail for openSUSE:Factory checked in at 2015-08-23 15:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multitail (Old) and /work/SRC/openSUSE:Factory/.multitail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multitail" Changes: -------- --- /work/SRC/openSUSE:Factory/multitail/multitail.changes 2013-04-02 12:30:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multitail.new/multitail.changes 2015-08-23 17:44:53.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Aug 7 16:31:35 UTC 2015 - mplus...@suse.com + +- Update to 6.4.1 + * no changelog provided +- Drop unreferrenced multitail-6.0-as-needed.patch +- Add multitail-6.4.1-gentoo.patch +- Add multitail-fix_missing_proto_do_check_for_mail.patch + +------------------------------------------------------------------- +Thu Feb 13 20:27:54 UTC 2014 - pascal.ble...@opensuse.org + +- update to 6.2: + * fixes -q/-Q (which automatically create windows by given search-criteria) +- dropped multitail-remove_date.patch, fixed upstream + +------------------------------------------------------------------- +Fri Jan 03 13:41:41 UTC 2014 - pascal.ble...@opensuse.org + +- update to 6.0: adds UTF-8 support +- dropped patch multitail-remove_unused_variables.patch, was a + nightmare to maintain + +------------------------------------------------------------------- +Fri Jun 21 05:23:58 UTC 2013 - pascal.ble...@opensuse.org + +- update to 5.2.13 + (no release notes available) + +------------------------------------------------------------------- Old: ---- multitail-5.2.12.tgz multitail-remove_date.patch New: ---- multitail-6.4.1-gentoo.patch multitail-6.4.1.tgz multitail-fix_missing_proto_do_check_for_mail.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multitail.spec ++++++ --- /var/tmp/diff_new_pack.aLNSuB/_old 2015-08-23 17:44:54.000000000 +0200 +++ /var/tmp/diff_new_pack.aLNSuB/_new 2015-08-23 17:44:54.000000000 +0200 @@ -1,7 +1,8 @@ -# vim: set ts=4 sw=4 et: - +# +# spec file for package multitail +# +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2012 Pascal Bleser <pascal.ble...@opensuse.org> -# 2004-2010 oc2pus # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,20 +14,23 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + Name: multitail -Summary: Tail Multiple Files -Version: 5.2.12 +Version: 6.4.1 Release: 0 -Group: System/X11/Terminals +Summary: Tail Multiple Files License: GPL-2.0+ -URL: http://www.vanheusden.com/multitail/ +Group: System/X11/Terminals +Url: http://www.vanheusden.com/multitail/ Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz -Patch2: multitail-remove_date.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# patch from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/multitail/files/ +Patch0: multitail-6.4.1-gentoo.patch +Patch3: multitail-fix_missing_proto_do_check_for_mail.patch BuildRequires: ncurses-devel -BuildRequires: make -BuildRequires: gcc +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MultiTail lets you view one or multiple files like the original @@ -46,46 +50,41 @@ %prep %setup -q -%patch2 +%patch0 -p1 +%patch3 -%__sed -i 's/\r//g' manual.html -%__chmod 644 manual.html +sed -i 's/\r//g' manual.html +chmod 644 manual.html -%__sed -i 's|/etc/%{name}|%{_datadir}/%{name}|g' "%{name}.conf" +sed -i 's|%{_sysconfdir}/%{name}|%{_datadir}/%{name}|g' "%{name}.conf" %build export CFLAGS="%{optflags} -I%{_includedir}/ncurses" -%__make %{?_smp_mflags} DEBUG="" +#as there is no .pc for ncurses in some older releases, specify manually +export LDFLAGS="-lpanelw -lncursesw " +make \ + PKG_CONFIG="pkg-config" \ + UTF8_SUPPORT=yes \ + CONFIG_FILE="%{_sysconfdir}/multitail.conf" %install -%__install -dm 755 %{buildroot}%{_sysconfdir} -%__install -m 644 %{name}.conf \ - %{buildroot}%{_sysconfdir} - -%__install -dm 755 %{buildroot}%{_bindir} -%__install -m 755 %{name} \ - %{buildroot}%{_bindir} - -%__install -dm 755 %{buildroot}%{_datadir}/%{name} -%__install -m 755 convert-* \ - %{buildroot}%{_datadir}/%{name} -%__install -m 755 colors-* \ - %{buildroot}%{_datadir}/%{name} +install -dm 755 %{buildroot}%{_sysconfdir} +install -m 644 %{name}.conf \ + %{buildroot}%{_sysconfdir}/ + +install -dm 755 %{buildroot}%{_bindir} +install -m 755 %{name} \ + %{buildroot}%{_bindir}/ -%__install -dm 755 %{buildroot}%{_mandir}/man1 -%__install -m 644 %{name}.1 \ +install -dm 755 %{buildroot}%{_mandir}/man1 +install -m 644 %{name}.1 \ %{buildroot}%{_mandir}/man1 -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - %files %defattr(-, root, root) -%doc *.txt Changes manual*.html +%doc *.txt manual*.html %config(noreplace) %{_sysconfdir}/%{name}.conf -%dir %{_datadir}/multitail -%{_datadir}/multitail/* %{_bindir}/multitail -%{_mandir}/man1/multitail.1%{ext_man} +%{_mandir}/man1/multitail.1* %changelog ++++++ multitail-6.4.1-gentoo.patch ++++++ Index: multitail-6.4.1/Makefile =================================================================== --- multitail-6.4.1.orig/Makefile +++ multitail-6.4.1/Makefile @@ -8,11 +8,11 @@ CONFIG_FILE=$(DESTDIR)/etc/multitail.con CC?=gcc DEBUG+=-g -Wall # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs ifeq ($(UTF8_SUPPORT),yes) -LDFLAGS+=-lpanelw -lncursesw -lutil -lm -CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT -D_FORTIFY_SOURCE=2 -O3 +LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm +CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT else -LDFLAGS+=-lpanel -lncurses -lutil -lm -CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -D_FORTIFY_SOURCE=2 -O3 +LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm +CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" endif OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o xclip.o @@ -20,10 +20,10 @@ OBJS=utils.o mt.o error.o my_pty.o term. all: multitail multitail: $(OBJS) - $(CC) $(OBJS) $(LDFLAGS) -o multitail + $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o multitail $(LIBS) multitail_ccmalloc: $(OBJS) - ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail + ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail $(LIBS) install: multitail mkdir -p $(DESTDIR)$(PREFIX)/bin ++++++ multitail-5.2.12.tgz -> multitail-6.4.1.tgz ++++++ ++++ 4932 lines of diff (skipped) ++++++ multitail-fix_missing_proto_do_check_for_mail.patch ++++++ Index: mt.c =================================================================== --- mt.c.orig +++ mt.c @@ -62,6 +62,8 @@ #include "config.h" #include "cmdline.h" +extern void do_check_for_mail(); + /* #define KEYB_DEBUG */ void LOG(char *s, ...) @@ -3506,7 +3508,7 @@ int wait_for_keypress(int what_help, dou /* check for mail */ if (now - msf_last_check >= check_for_mail) { - do_check_for_mail(now); + do_check_for_mail(); msf_last_check = now; }
