Hello community, here is the log from the commit of package lifelines for openSUSE:Factory checked in at 2019-08-27 10:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lifelines (Old) and /work/SRC/openSUSE:Factory/.lifelines.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lifelines" Tue Aug 27 10:24:52 2019 rev:30 rq:726098 version:3.1.1+3ad4571 Changes: -------- --- /work/SRC/openSUSE:Factory/lifelines/lifelines.changes 2017-02-14 00:41:56.544944909 +0100 +++ /work/SRC/openSUSE:Factory/.lifelines.new.7948/lifelines.changes 2019-08-27 10:24:56.527925357 +0200 @@ -1,0 +2,17 @@ +Fri Aug 23 12:55:47 UTC 2019 - Dr. Werner Fink <wer...@suse.de> + +- Switch from LDFLAGS to LIBS to let configure find has_key() in libtinfo + +------------------------------------------------------------------- +Fri Aug 23 11:23:21 UTC 2019 - Dr. Werner Fink <wer...@suse.de> + +- Update to lifelines git version 3ad4571, which is the follower + of lifelines version 3.1.1 (bug boo#1146704) + * Removep patches + lifelines-3.0.59-funcptr.dif now upstream solved + lifelines-decl.patch now superfluous + * Port patches + lifelines-3.0.60-array.dif which becomes lifelines-3ad4571-array.dif + lifelines-3.0.62.dif which becomes lifelines-3ad4571.dif + +------------------------------------------------------------------- Old: ---- lifelines-3.0.59-funcptr.dif lifelines-3.0.60-array.dif lifelines-3.0.62.dif lifelines-3.0.62.tar.bz2 lifelines-decl.patch sh.rellink New: ---- lifelines-3ad4571-array.dif lifelines-3ad4571.dif lifelines-3ad4571.tar.gz lifelines-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lifelines.spec ++++++ --- /var/tmp/diff_new_pack.e8wXqX/_old 2019-08-27 10:24:57.055925321 +0200 +++ /var/tmp/diff_new_pack.e8wXqX/_new 2019-08-27 10:24:57.059925321 +0200 @@ -1,7 +1,7 @@ # # spec file for package lifelines # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: lifelines +%global commit 3ad4571 +%global longcommit 3ad457132c47fde69545d6647d5804c573764631 +Version: 3.1.1+%{commit} +Release: 0 +Summary: The Lifelines Genealogy Program +License: MIT +Group: Productivity/Scientific/Other +Url: https://github.com/lifelines/lifelines +Source0: https://github.com/%{name}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz +Source1: %{name}-rpmlintrc +# PATCH-FIX-SUSE mainly to get paths correct if installed as system package +Patch0: lifelines-%{commit}.dif +# PATCH-FIX-SUSE avoid memory leak as well as no initialized array +Patch1: lifelines-%{commit}-array.dif BuildRequires: automake BuildRequires: bison +BuildRequires: dblatex BuildRequires: docbook-utils BuildRequires: dos2unix BuildRequires: libjpeg-devel @@ -30,36 +45,23 @@ BuildRequires: perl-XML-SAX BuildRequires: perl-libwww-perl BuildRequires: texlive -BuildRequires: texlive-jadetex -BuildRequires: texlive-latex -BuildRequires: texlive-xmltex -%if 0%{?suse_version} > 1220 +BuildRequires: texlive-babel +BuildRequires: texlive-babel-swedish +BuildRequires: texlive-cmap BuildRequires: texlive-courier BuildRequires: texlive-dvips BuildRequires: texlive-ec +BuildRequires: texlive-fancybox BuildRequires: texlive-helvetic +BuildRequires: texlive-jadetex +BuildRequires: texlive-jknapltx +BuildRequires: texlive-latex BuildRequires: texlive-times -%endif -Version: 3.0.62 -Release: 0 -Summary: The Lifelines Genealogy Program -License: MIT -Group: Productivity/Scientific/Other -Url: http://lifelines.sourceforge.net/ -Source: http://download.sourceforge.net/lifelines/lifelines-3.0.62.tar.bz2 -Source1: sh.rellink -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch0: lifelines-3.0.62.dif -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: lifelines-3.0.59-funcptr.dif -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch2: lifelines-3.0.60-array.dif -# PATCH-FIX-UPSTREAM Fix conflicting declaration -Patch3: lifelines-decl.patch +BuildRequires: texlive-xmltex BuildRequires: tidy +BuildRequires: w3m +BuildRequires: xmlto BuildRoot: %{_tmppath}/%{name}-%{version}-build -%global _sysconfdir /etc -%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${@:$#}) %description Lifelines is terminal-based program that allows the tracking of @@ -67,82 +69,59 @@ system but requires knowledge in the ll format. %prep -%setup -q -%patch0 -p 0 -%patch1 -p 0 -%patch2 -p 0 -%patch3 -p1 +%setup -q -c -T -n %{name}-%{commit} +tar -x --strip-components=1 -z -f %{SOURCE0} +%patch0 -p0 -b .p0 +%patch1 -p0 -b .p1 %build -CFLAGS="%{optflags} -fno-strict-aliasing -pipe $(%{ncursesw_config} --cflags)" +if test $(getconf LONG_BIT) -gt 32 +then + arch=--with-64bit +else + arch=--with-32bit +fi +CFLAGS="%{optflags} -fno-strict-aliasing -pipe $(pkg-config ncursesw --cflags) $(getconf LFS_CFLAGS)" CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_CURSES" -LDFLAGS="$(%{ncursesw_config} --libs)" +LIBS="$(pkg-config ncursesw --libs)" CC=gcc -export CC CFLAGS CPPFLAGS LDFLAGS +export CC CFLAGS CPPFLAGS LIBS autoreconf -fi -./configure --prefix=%{_prefix} -exec-prefix=%{_prefix} \ - --libexecdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --disable-rpath \ +%configure --disable-rpath \ --with-gnu-ld \ --with-docs \ - --without-included-gettex \ - --with-libintl-prefix=%{_prefix} \ - --with-included-gettext=%{_prefix} -make -#chmod 644 docs/*.1 -rm -f docs/*.pdf + $arch \ + --with-libintl-prefix=%{_prefix} +make %{?_smp_mflags} make -C docs/ +dos2unix lines.cfg %install -. %{SOURCE1} make DESTDIR=%{buildroot} \ - docdir=%{_defaultdocdir}/lifelines/doc \ - pkgdatadir=%{_defaultdocdir}/lifelines/doc \ + docdir=%{_defaultdocdir}/%{name} \ + pkgdatadir=%{_datadir}/%{name} \ install make -C docs/ DESTDIR=%{buildroot} \ - docdir=%{_defaultdocdir}/lifelines/doc \ - pkgdatadir=%{_defaultdocdir}/lifelines/doc \ + docdir=%{_defaultdocdir}/%{name} \ + pkgdatadir=%{_datadir}/%{name} \ install -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 docs/*.1 %{buildroot}%{_mandir}/man1/ -mkdir -p %{buildroot}%{_datadir}/lifelines/reports/st -install -m 644 reports/*.l[li] %{buildroot}%{_datadir}/lifelines/reports/ -install -m 644 reports/st/*.l[li] %{buildroot}%{_datadir}/lifelines/reports/st/ -mkdir -p %{buildroot}%{_datadir}/lifelines/tt -install -m 644 tt/*.tt %{buildroot}%{_datadir}/lifelines/tt/ -mkdir -p %{buildroot}%{_defaultdocdir}/lifelines/reports -install -m 644 reports/CREDIT %{buildroot}%{_defaultdocdir}/lifelines/reports/ -install -m 644 reports/index.html reports/boc.gif reports/ll.png %{buildroot}%{_defaultdocdir}/lifelines/reports/ -install -m 644 README ChangeLog NEWS AUTHORS LICENSE %{buildroot}%{_defaultdocdir}/lifelines/ -rm -f %{buildroot}%{_defaultdocdir}/lifelines/doc/*.l[li] -path=$(relpath %{buildroot}%{_datadir}/lifelines/reports %{buildroot}%{_defaultdocdir}/lifelines/doc) -for l in %{buildroot}%{_datadir}/lifelines/reports/*.l[li] ; do - ln -sf ${path}/${l##*/} %{buildroot}%{_defaultdocdir}/lifelines/doc/ -done -rm -f %{buildroot}%{_defaultdocdir}/lifelines/doc/{README,NEWS,LICENSE,CREDIT,AUTHORS} -rm -f %{buildroot}%{_defaultdocdir}/lifelines/doc/{INSTALL,README.MAINTAINERS.win32} -if test -e %{buildroot}%{_defaultdocdir}/lifelines/doc/.linesrc ; then - mv %{buildroot}%{_defaultdocdir}/lifelines/doc/.linesrc \ - %{buildroot}%{_defaultdocdir}/lifelines/doc/dot.linesrc -fi -if test -e %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg ; then - mv %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg \ - %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg.tmp - dos2unix -n %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg.tmp \ - %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg - rm -f %{buildroot}%{_defaultdocdir}/lifelines/doc/lines.cfg.tmp -fi %find_lang %{name} +rm -vf %{buildroot}%{_defaultdocdir}/%{name}/INSTALL +mkdir -p %{buildroot}%{_sysconfdir}/skel +mv %{buildroot}%{_defaultdocdir}/%{name}/.linesrc \ + %{buildroot}%{_sysconfdir}/skel/ +chmod 755 %{buildroot}%{_datadir}/%{name}/gen_index +rm -vf %{buildroot}%{_datadir}/%{name}/desc-tex2/tree.tex +rm -vf %{buildroot}%{_datadir}/%{name}/pedtex/tree.tex +ln -sf ../tree.tex %{buildroot}%{_datadir}/%{name}/desc-tex2/tree.tex +ln -sf ../tree.tex %{buildroot}%{_datadir}/%{name}/pedtex/tree.tex %files -f %{name}.lang %defattr(-,root,root) -%doc %{_defaultdocdir}/lifelines +%config %{_sysconfdir}/skel/.linesrc +%doc %{_defaultdocdir}/%{name} %{_bindir}/* -%{_datadir}/lifelines +%{_datadir}/%{name} %doc %{_mandir}/man1/*.gz %changelog ++++++ lifelines-3ad4571-array.dif ++++++ --- src/liflines/ask.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- src/liflines/ask.c +++ src/liflines/ask.c 2019-08-23 09:36:21.892382295 +0000 @@ -178,6 +178,7 @@ ask_for_file_worker (STRING mode, rtn = ask_for_output_filename(ttl, path, prompt, fname, sizeof(fname)); if (pfname) { + free(*pfname); if (fname[0]) *pfname = strdup(fname); else @@ -504,7 +505,7 @@ ask_for_record (STRING idstr, INT letr) STRING ask_for_record_key (STRING title, STRING prompt) { - char answer[MAXPATHLEN]; + char answer[MAXPATHLEN] = {'\0'}; if (!ask_for_string(title, prompt, answer, sizeof(answer))) return NULL; if (!answer[0]) return NULL; ++++++ lifelines-3ad4571.dif ++++++ --- docs/manual/Makefile.am | 4 ++-- src/gedlib/translat.c | 2 +- src/hdrs/standard.h | 7 +++++++ src/interp/builtin.c | 4 ++-- src/interp/interp.c | 4 ++-- src/liflines/screen.c | 4 ++-- 6 files changed, 16 insertions(+), 9 deletions(-) --- docs/manual/Makefile.am +++ docs/manual/Makefile.am 2019-08-23 10:13:42.930453437 +0000 @@ -64,8 +64,8 @@ CLEANFILES += $(MANUALS) @TOOL_DBLATEX@ $^ .xml.html: - @TOOL_XMLTO@ -x @srcdir@/ll-html.xsl xhtml-nochunks $^ + @TOOL_XMLTO@ --skip-validation -x @srcdir@/ll-html.xsl xhtml-nochunks $^ .xml.txt: - @TOOL_XMLTO@ txt $^ + @TOOL_XMLTO@ --skip-validation txt $^ endif --- src/gedlib/translat.c +++ src/gedlib/translat.c 2019-08-23 10:12:14.556107226 +0000 @@ -303,7 +303,7 @@ transl_get_xlat (CNSTRING src, CNSTRING void transl_load_all_tts (void) { - CNSTRING ttpath = getlloptstr("TTPATH", "."); + CNSTRING ttpath = getlloptstr("TTPATH", "/usr/share/lifelines/tt"); if (!inited) local_init(); xl_load_all_dyntts(ttpath); } --- src/hdrs/standard.h +++ src/hdrs/standard.h 2019-08-23 10:12:14.556107226 +0000 @@ -82,6 +82,13 @@ #define INCLUDED_STDARG_H #endif +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> +#endif +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif + /* Having 'char *' instead of 'unsigned char *' removes about */ /* 1800 compiler warnings. We still need to investigate *every* */ /* instance where a STRING is dereferenced and the contents acted */ --- src/interp/builtin.c +++ src/interp/builtin.c 2019-08-23 10:12:14.556107226 +0000 @@ -1141,7 +1141,7 @@ llrpt_f (PNODE node, SYMTAB stab, BOOLEA PVALUE llrpt_alpha (PNODE node, SYMTAB stab, BOOLEAN *eflg) { - static char scratch[2]; + static char scratch[3]; INT i; PNODE argvar = builtin_args(node); PVALUE val = eval_and_coerce(PINT, argvar, stab, eflg); @@ -3456,7 +3456,7 @@ llrpt_copyfile (PNODE node, SYMTAB stab, PNODE argvar = builtin_args(node); PVALUE val = eval_and_coerce(PSTRING, argvar, stab, eflg); char buffer[1024]; - STRING programsdir = getlloptstr("LLPROGRAMS", "."); + STRING programsdir = getlloptstr("LLPROGRAMS", "/usr/share/lifelines/reports"); if (*eflg) { prog_error(node, nonstr1, "copyfile"); goto copyfile_end; --- src/interp/interp.c +++ src/interp/interp.c 2019-08-23 10:12:14.556107226 +0000 @@ -246,7 +246,7 @@ interp_program_list (STRING proc, INT na } else { PATHINFO pathinfo = 0; STRING fname=0, fullpath=0; - STRING programsdir = getlloptstr("LLPROGRAMS", "."); + STRING programsdir = getlloptstr("LLPROGRAMS", "/usr/share/lifelines/reports"); if (!rptui_ask_for_program(LLREADTEXT, _(qSwhatrpt), &fname, &fullpath , programsdir, ".ll", picklist)) { if (fname) { @@ -455,7 +455,7 @@ remove_tables (PACTX pactx) static BOOLEAN find_program (CNSTRING fname, STRING localdir, STRING *pfull,BOOLEAN include) { - STRING programsdir = getlloptstr("LLPROGRAMS", "."); + STRING programsdir = getlloptstr("LLPROGRAMS", "/usr/share/lifelines/reports"); FILE * fp = 0; ZSTR zstr=zs_new(); BOOLEAN rtn=FALSE; --- src/liflines/screen.c +++ src/liflines/screen.c 2019-08-23 10:12:14.556107226 +0000 @@ -1608,7 +1608,7 @@ invoke_cset_display (void) enqueue_list(list, strsave(zs_str(zstr))); } - zs_setf(zstr, "TTPATH: %s", getlloptstr("TTPATH", ".")); + zs_setf(zstr, "TTPATH: %s", getlloptstr("TTPATH", "/usr/share/lifelines/tt")); enqueue_list(list, strsave(zs_str(zstr))); if (charprops_is_loaded()) { @@ -1754,7 +1754,7 @@ load_tt_action (void) } /* Ask whence to load it */ - ttimportdir = getlloptstr("TTPATH", "."); + ttimportdir = getlloptstr("TTPATH", "/usr/share/lifelines/tt"); fp = ask_for_input_file(LLREADTEXT, _(qSmintt), &fname, ttimportdir, ".tt"); if (fp) { fclose(fp); ++++++ lifelines-rpmlintrc ++++++ addFilter(".*W:.*name-repeated-in-summary.*C.*Lifelines.*") addFilter(".*E:.*devel-file-in-non-devel-package.*/usr/share/lifelines/bib2html.c.*") addFilter(".*E:.*devel-file-in-non-devel-package.*/usr/share/lifelines/bury.c.*")
