Hello community, here is the log from the commit of package idzebra for openSUSE:Factory checked in at 2013-09-05 23:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/idzebra (Old) and /work/SRC/openSUSE:Factory/.idzebra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "idzebra" Changes: -------- --- /work/SRC/openSUSE:Factory/idzebra/idzebra.changes 2013-08-23 11:07:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.idzebra.new/idzebra.changes 2013-09-05 23:20:48.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Sep 4 12:18:44 UTC 2013 - i...@marguerite.su + +- fix build with tcl 8.5+ + * tcl_interp->errorline/result is depreciated and replaced with + Tcl_GetErrorline/Tcl_GetStringResult. + * online documentations claim these functions were marked in 8.6 + but actually in 8.5 errorline is marked. +- add patch: idzebra-2.0.55-tcl-8.6-abuild.patch + +------------------------------------------------------------------- +Thu Aug 29 14:17:40 UTC 2013 - k...@suse.de + +- Version 2.0.55; for details, see http://indexdata.dk/zebra/doc/NEWS; + e.g.: + + Add + document zebraidx command "check", which checks consistency + of register. + +------------------------------------------------------------------- Old: ---- idzebra-2.0.54.tar.gz New: ---- idzebra-2.0.55-tcl-8.5-abuild.patch idzebra-2.0.55.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ idzebra.spec ++++++ --- /var/tmp/diff_new_pack.DB7QjL/_old 2013-09-05 23:20:49.000000000 +0200 +++ /var/tmp/diff_new_pack.DB7QjL/_new 2013-09-05 23:20:49.000000000 +0200 @@ -17,35 +17,31 @@ Name: idzebra +Version: 2.0.55 +Release: 0 +Summary: Fielded Free Text Engine with a Z39.50 Frontend +License: GPL-2.0+ +Group: Productivity/Databases/Servers +Url: http://www.indexdata.dk/zebra/ +Source: http://ftp.indexdata.dk/pub/zebra/%{name}-%{version}.tar.gz +#PATCH-FIX-UPSTREAM marguer...@opensuse.org - tcl_interp->errorline/result is depreciated in tcl 8.5 +Patch: idzebra-2.0.55-tcl-8.5-abuild.patch BuildRequires: libexpat-devel BuildRequires: libyaz-devel BuildRequires: openssl-devel BuildRequires: readline-devel BuildRequires: tcl-devel BuildRequires: tcpd-devel -Version: 2.0.54 -Release: 0 Requires: yaz -Source: http://ftp.indexdata.dk/pub/zebra/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.indexdata.dk/zebra/ -Summary: Fielded Free Text Engine with a Z39.50 Front-End -License: GPL-2.0+ -Group: Productivity/Databases/Servers %description Zebra is a fielded free text indexing and retrieval engine with a Z39.50 front-end. You can use any compatible, commercial, or freeware Z39.50 client to access data stored in Zebra. - - -Authors: --------- - Adam Dickmeiss <a...@indexdata.dk> - %package devel -Summary: Fielded Free Text Engine with a Z39.50 Front-End +Summary: Fielded Free Text Engine with a Z39.50 Frontend Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: glibc-devel @@ -56,12 +52,6 @@ Z39.50 front-end. You can use any compatible, commercial, or freeware Z39.50 client to access data stored in Zebra. - - -Authors: --------- - Adam Dickmeiss <a...@indexdata.dk> - %package doc Summary: Documentation for the idzebra Package Group: Productivity/Databases/Servers @@ -71,19 +61,14 @@ This package contains the documentation for Zebra. Zebra is a fielded free text indexing and retrieval engine with a Z39.50 front-end. - - -Authors: --------- - Adam Dickmeiss <a...@indexdata.dk> - %prep %setup -q +%patch -p1 %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure --disable-static --with-pic --with-yazconfig=%{_bindir} -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} for f in examples/marcxml/*.x?l; do tr -d '\15' <$f >$f.tmp && mv $f.tmp $f done @@ -96,12 +81,12 @@ %endif %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # pushd doc -# make DESTDIR=$RPM_BUILD_ROOT install +# make DESTDIR=%{buildroot} install # popd # Unwanted doc stuff -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc +rm -fr %{buildroot}%{_datadir}/doc # rm -fr html mkdir html @@ -124,17 +109,17 @@ done echo "</li></body></html>" } >index.html -pushd $RPM_BUILD_ROOT +pushd %{buildroot} mkdir -p etc/idzebra usr/share/idzebra cp -a usr/share/idzebra*/tab/* etc/idzebra rm -fr usr/share/idzebra*/tab - pushd $RPM_BUILD_ROOT/usr/share/idzebra + pushd %{buildroot}%{_datadir}/idzebra ln -sf ../../../etc/idzebra tab popd popd rm examples/*/Makefile* -rm -fr $RPM_BUILD_ROOT/usr/share/idzebra-2.0-examples -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + +rm -fr %{buildroot}%{_datadir}/idzebra-2.0-examples +find %{buildroot} -type f -name "*.la" -delete -print find examples -type f -name '*.pl' -exec chmod -x {} \; %post -p /sbin/ldconfig ++++++ idzebra-2.0.55-tcl-8.5-abuild.patch ++++++ Index: idzebra-2.0.55/index/mod_grs_regx.c =================================================================== --- idzebra-2.0.55.orig/index/mod_grs_regx.c +++ idzebra-2.0.55/index/mod_grs_regx.c @@ -1301,8 +1301,13 @@ static void execTcl (struct lexSpec *spe { const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0); yaz_log(YLOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s", - spec->tcl_interp->errorLine, +#if (TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5) + Tcl_GetErrorline(spec->tcl_interp), + Tcl_GetStringResult(spec->tcl_interp), +#else + spec->tcl_interp->errorline, spec->tcl_interp->result, +#endif err ? err : "[NO ERRORINFO]"); } } ++++++ idzebra-2.0.54.tar.gz -> idzebra-2.0.55.tar.gz ++++++ ++++ 22572 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
