Hello community, here is the log from the commit of package lifelines checked in at Fri Aug 3 01:36:48 CEST 2007. -------- --- lifelines/lifelines.changes 2007-06-21 18:30:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/lifelines/lifelines.changes 2007-08-01 15:14:38.748819000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 1 12:11:27 CEST 2007 - werner@suse.de + +- Update to lifelines 3.0.60: Fixes a lot of documentation +- Avoid broken brp-symlink check +- Avoid some RPMlint warnings + +------------------------------------------------------------------- Old: ---- lifelines-3.0.59.dif lifelines-3.0.59.tar.bz2 New: ---- lifelines-3.0.60-array.dif lifelines-3.0.60.dif lifelines-3.0.60.tar.bz2 sh.rellink ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lifelines.spec ++++++ --- /var/tmp/diff_new_pack.t17564/_old 2007-08-03 01:36:37.000000000 +0200 +++ /var/tmp/diff_new_pack.t17564/_new 2007-08-03 01:36:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lifelines (Version 3.0.59) +# spec file for package lifelines (Version 3.0.60) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,20 @@ # norootforbuild Name: lifelines -BuildRequires: bison docbook-utils libjpeg-devel libpng libxslt-devel ncurses-devel perl-XML-DOM perl-XML-Parser perl-XML-SAX perl-libwww-perl texlive tidy +BuildRequires: bison docbook-utils dos2unix libjpeg-devel libpng libxslt-devel ncurses-devel perl-XML-DOM perl-XML-Parser perl-XML-SAX perl-libwww-perl texlive tidy URL: http://lifelines.sourceforge.net/ License: X11/MIT Group: Productivity/Scientific/Other Autoreqprov: on -Version: 3.0.59 +Version: 3.0.60 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The Lifelines Genealogy Program -Source: http://download.sourceforge.net/lifelines/lifelines-3.0.59.tar.bz2 -Patch: lifelines-3.0.59.dif +Source: http://download.sourceforge.net/lifelines/lifelines-3.0.60.tar.bz2 +Source1: sh.rellink +Patch: lifelines-3.0.60.dif Patch1: lifelines-3.0.59-funcptr.dif +Patch2: lifelines-3.0.60-array.dif %description Lifelines is terminal-based program that allows the tracking of @@ -45,6 +47,7 @@ %setup %patch -p 0 %patch1 -p 0 +%patch2 -p 0 %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" @@ -73,40 +76,58 @@ make -C docs/ %install -make DESTDIR=${RPM_BUILD_ROOT} \ +. %{S:1} +make DESTDIR=%{buildroot} \ docdir=%{_defaultdocdir}/lifelines/doc \ pkgdatadir=%{_defaultdocdir}/lifelines/doc \ install -make -C docs/ DESTDIR=${RPM_BUILD_ROOT} \ +make -C docs/ DESTDIR=%{buildroot} \ docdir=%{_defaultdocdir}/lifelines/doc \ pkgdatadir=%{_defaultdocdir}/lifelines/doc \ install -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 -install -m 644 docs/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/ -mkdir -p ${RPM_BUILD_ROOT}/usr/share/lifelines/reports/st -install -m 644 reports/*.l[li] ${RPM_BUILD_ROOT}/usr/share/lifelines/reports/ -install -m 644 reports/st/*.l[li] ${RPM_BUILD_ROOT}/usr/share/lifelines/reports/st/ -mkdir -p ${RPM_BUILD_ROOT}/usr/share/lifelines/tt -install -m 644 tt/*.tt ${RPM_BUILD_ROOT}/usr/share/lifelines/tt/ -mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/reports -install -m 644 reports/CREDIT ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/reports/ -install -m 644 reports/index.html reports/boc.gif reports/ll.png ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/reports/ -install -m 644 README ChangeLog NEWS AUTHORS LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/ -rm -f ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/doc/*.ll -ln -sf /usr/share/lifelines/reports/*.ll ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/doc/ -rm -f ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/doc/*.li -ln -sf /usr/share/lifelines/reports/*.li ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/doc/ -rm -f ${RPM_BUILD_ROOT}%{_defaultdocdir}/lifelines/doc/{README,NEWS,LICENSE,CREDIT,AUTHORS} +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 -%files +%files -f %{name}.lang %defattr(-,root,root) %doc %{_defaultdocdir}/lifelines /usr/bin/* -/usr/share/locale/*/LC_MESSAGES/*.mo -/usr/share/lifelines -%{_mandir}/man1/*.gz +%{_datadir}/lifelines +%doc %{_mandir}/man1/*.gz %changelog +* Wed Aug 01 2007 - werner@suse.de +- Update to lifelines 3.0.60: Fixes a lot of documentation +- Avoid broken brp-symlink check +- Avoid some RPMlint warnings * Thu Jun 21 2007 - werner@suse.de - Update to lifelines 3.0.59: Is able to handle UTF-8 * Sun Apr 22 2007 - ro@suse.de ++++++ lifelines-3.0.60-array.dif ++++++ --- src/gedlib/translat.c +++ src/gedlib/translat.c 2007-08-01 14:23:38.854791947 +0200 @@ -265,7 +265,7 @@ translate_write(XLAT ttm, STRING in, INT /* translate & write out current line */ /* TODO (2002-11-28): modify to use dynamic string */ translate_string(ttm, intmp, out, MAXLINELEN+2); - if (out && strlen(out)) { + if ((out[0] != '\0') && strlen(out)) { outbytes = fwrite(out, 1, strlen(out), ofp); if (!outbytes || ferror(ofp)) { crashlog("outbytes=%d, errno=%d, outstr=%s" --- src/liflines/ask.c +++ src/liflines/ask.c 2007-08-01 14:24:54.170811027 +0200 @@ -178,10 +178,11 @@ ask_for_file_worker (STRING mode, rtn = ask_for_output_filename(ttl, path, prompt, fname, sizeof(fname)); if (pfname) { - if (fname && fname[0]) + free(*pfname); + if (fname[0] != '\0') *pfname = strdup(fname); else - *pfname = 0; + *pfname = (char*)0; } if (pfullpath) *pfullpath = 0; /* 0 indicates we didn't try to open */ @@ -297,7 +298,7 @@ ask_for_indiseq (CNSTRING ttl, char ctyp *prc = RC_DONE; if (!ask_for_string(ttl, _(qSidbrws), name, sizeof(name))) return NULL; - if (!name || *name == 0) return NULL; + if (name[0] == '\0') return NULL; *prc = RC_NOSELECT; if (eqstr(name, "@")) { seq = invoke_search_menu(); @@ -504,9 +505,9 @@ 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) return NULL; + if (answer[0] == '\0') return NULL; return strsave(answer); } ++++++ lifelines-3.0.59.dif -> lifelines-3.0.60.dif ++++++ --- lifelines/lifelines-3.0.59.dif 2007-06-21 17:56:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/lifelines/lifelines-3.0.60.dif 2007-08-01 12:08:06.054243000 +0200 @@ -9,8 +9,8 @@ EXTRA_DIST = .linesrc lines.cfg lines.cfg.input \ COPYING LICENSE INSTALL NEWS README AUTHORS ABOUT-NLS \ ---- configure.in -+++ configure.in 2007-06-21 17:12:54.208287527 +0200 +--- configure.ac ++++ configure.ac 2007-08-01 12:07:41.203604082 +0200 @@ -46,6 +46,7 @@ dnl ALL_LINGUAS is not needed with lates dnl but debian maintainer still needs it dnl These languages should be a copy of po/LINGUAS @@ -20,7 +20,7 @@ dnl codeset conversion library --- src/gedlib/translat.c -+++ src/gedlib/translat.c 2007-06-21 17:02:42.174934041 +0200 ++++ src/gedlib/translat.c 2007-06-21 17:02:42.174934000 +0200 @@ -307,7 +307,7 @@ transl_get_xlat (CNSTRING src, CNSTRING void transl_load_all_tts (void) @@ -31,7 +31,7 @@ xl_load_all_dyntts(ttpath); } --- src/hdrs/mycurses.h -+++ src/hdrs/mycurses.h 2007-06-21 17:55:06.694758668 +0200 ++++ src/hdrs/mycurses.h 2007-06-21 17:55:06.694758000 +0200 @@ -5,8 +5,10 @@ #include "config.h" @@ -46,7 +46,7 @@ #elif defined(HAVE_WINDOWS_H) #include "win32/curses.h" --- src/hdrs/standard.h -+++ src/hdrs/standard.h 2007-06-21 17:07:40.514791751 +0200 ++++ src/hdrs/standard.h 2007-06-21 17:07:40.514791000 +0200 @@ -82,6 +82,13 @@ #define INCLUDED_STDARG_H #endif @@ -71,7 +71,7 @@ #define FLOAT double --- src/interp/builtin.c -+++ src/interp/builtin.c 2007-06-21 17:10:28.236701051 +0200 ++++ src/interp/builtin.c 2007-06-21 17:10:28.236701000 +0200 @@ -1167,7 +1167,7 @@ llrpt_f (PNODE node, SYMTAB stab, BOOLEA PVALUE llrpt_alpha (PNODE node, SYMTAB stab, BOOLEAN *eflg) @@ -91,7 +91,7 @@ prog_error(node, nonstr1, "copyfile"); goto copyfile_end; --- src/interp/interp.c -+++ src/interp/interp.c 2007-06-21 17:11:29.487241265 +0200 ++++ src/interp/interp.c 2007-06-21 17:11:29.487241000 +0200 @@ -250,7 +250,7 @@ interp_program_list (STRING proc, INT na } else { PATHINFO pathinfo = 0; @@ -111,7 +111,7 @@ ZSTR zstr=zs_new(); BOOLEAN rtn=FALSE; --- src/liflines/screen.c -+++ src/liflines/screen.c 2007-06-21 17:12:14.584056580 +0200 ++++ src/liflines/screen.c 2007-06-21 17:12:14.584056000 +0200 @@ -1606,7 +1606,7 @@ invoke_cset_display (void) enqueue_list(list, strsave(zs_str(zstr))); } ++++++ lifelines-3.0.59.tar.bz2 -> lifelines-3.0.60.tar.bz2 ++++++ ++++ 24315 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de