Hello community, here is the log from the commit of package xbase checked in at Wed Apr 16 16:00:12 CEST 2008. -------- --- xbase/xbase.changes 2007-11-13 15:03:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/xbase/xbase.changes 2008-04-16 14:19:44.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 14:19:39 CEST 2008 - schwab@suse.de + +- Fix configure script. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbase.spec ++++++ --- /var/tmp/diff_new_pack.G11035/_old 2008-04-16 15:59:41.000000000 +0200 +++ /var/tmp/diff_new_pack.G11035/_new 2008-04-16 15:59:41.000000000 +0200 @@ -1,14 +1,14 @@ # # spec file for package xbase (Version 2.0.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: xbase BuildRequires: doxygen gcc-c++ libstdc++-devel @@ -17,7 +17,7 @@ Summary: XBase Compatible C++ Class Library Url: http://www.rekallrevealed.org/packages/ Version: 2.0.0 -Release: 189 +Release: 216 Source0: %name-%version.tar.bz2 Patch1: %name-%version-makefiles.patch Patch2: %name-%version-gcc41fix.patch @@ -49,6 +49,7 @@ Vitaly Fedrushkov <willy@snowyowl.csu.ac.ru> - TV support and more %package devel +License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: Developmnet files for XBase Compatible C++ Class Library Requires: %{name} = %{version} @@ -78,6 +79,7 @@ Vitaly Fedrushkov <willy@snowyowl.csu.ac.ru> - TV support and more %package doc +License: LGPL v2.1 or later Group: Productivity/Databases/Tools Summary: Developer documentation for XBase Compatible C++ Class Library Requires: %{name} = %{version} @@ -114,7 +116,6 @@ %patch3 %build -libtoolize --force autoreconf -i -f export CXXFLAGS="$RPM_OPT_FLAGS" ./configure LDFLAGS=' ' \ @@ -128,11 +129,9 @@ make DESTDIR="$RPM_BUILD_ROOT" install mv $RPM_BUILD_ROOT/usr/bin/zap $RPM_BUILD_ROOT/usr/bin/xbase-zap -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %clean rm -rf ${RPM_BUILD_ROOT} @@ -155,33 +154,36 @@ %files doc %defattr(-,root,root) %doc docs/html + %changelog -* Tue Nov 13 2007 - lmichnovic@suse.cz +* Wed Apr 16 2008 schwab@suse.de +- Fix configure script. +* Tue Nov 13 2007 lmichnovic@suse.cz - renamed patches: xbase.diff -> xbase-%%version-makefiles.patch fix-gcc41.diff -> xbase-%%version-gcc41fix.patch - <iostream.h> should be <iostream> (*iostream_h.patch) since new stdlibc++43 does not include deprecated header files -* Tue Nov 13 2007 - lmichnovic@suse.cz +* Tue Nov 13 2007 lmichnovic@suse.cz - added libstdc++-devel into BuildReq -* Fri Nov 09 2007 - lmichnovic@suse.cz +* Fri Nov 09 2007 lmichnovic@suse.cz - added split provides -* Wed Nov 07 2007 - lmichnovic@suse.cz +* Wed Nov 07 2007 lmichnovic@suse.cz - split off devel and doc subpackage -* Wed Sep 13 2006 - dmueller@suse.de +* Wed Sep 13 2006 dmueller@suse.de - /usr/bin/zap -> /usr/bin/xbase-zap -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - schwab@suse.de +* Fri Jan 20 2006 schwab@suse.de - Don't strip binaries. -* Tue Oct 18 2005 - stbinner@suse.de +* Tue Oct 18 2005 stbinner@suse.de - remove extra qualification for gcc 4.1 compilation -* Thu Nov 18 2004 - ro@suse.de +* Thu Nov 18 2004 ro@suse.de - fixed file list -* Thu Aug 12 2004 - ro@suse.de +* Thu Aug 12 2004 ro@suse.de - added libpng to neededforbuild (for doxygen) -* Tue Jan 13 2004 - schwab@suse.de +* Tue Jan 13 2004 schwab@suse.de - Fix quoting in autoconf macros. - Remove old libtool macros. -* Tue Nov 18 2003 - adrian@suse.de +* Tue Nov 18 2003 adrian@suse.de - initial package of version 2.0.0 ++++++ xbase-2.0.0-makefiles.patch ++++++ --- /var/tmp/diff_new_pack.G11035/_old 2008-04-16 15:59:41.000000000 +0200 +++ /var/tmp/diff_new_pack.G11035/_new 2008-04-16 15:59:41.000000000 +0200 @@ -1,6 +1,6 @@ --- Makefile.am +++ Makefile.am -@@ -53,4 +53,4 @@ +@@ -53,4 +53,4 @@ rpm : dist docs : (cd docs ; make docs) @@ -18,7 +18,7 @@ [ $3=NO for i in $2; -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ done ## macro AC_PATH_X ## ------------------------------------------------------------------------ ## @@ -27,7 +27,7 @@ [ AC_MSG_CHECKING(for X) AC_CACHE_VAL(ac_cv_have_x, -@@ -101,43 +101,7 @@ +@@ -101,43 +101,7 @@ AC_SUBST(x_includes) all_includes=$X_INCLUDES ]) @@ -72,7 +72,7 @@ [ AC_LANG_CPLUSPLUS save_CXXFLAGS=$CXXFLAGS -@@ -165,7 +129,7 @@ +@@ -165,7 +129,7 @@ fi CXXFLAGS=$save_CXXFLAGS ]) @@ -81,7 +81,7 @@ [ AC_LANG_CPLUSPLUS save_CXXFLAGS=$CXXFLAGS -@@ -194,7 +158,7 @@ +@@ -194,7 +158,7 @@ fi CXXFLAGS=$save_CXXFLAGS ]) @@ -90,7 +90,7 @@ [ AC_LANG_CPLUSPLUS -@@ -220,7 +184,7 @@ +@@ -220,7 +184,7 @@ fi LIBS=$ac_libs_safe ]) @@ -99,7 +99,7 @@ [AC_MSG_CHECKING([for giflib]) AC_CACHE_VAL(ac_cv_lib_gif, [ac_save_LIBS="$LIBS" -@@ -250,7 +214,7 @@ +@@ -250,7 +214,7 @@ else fi ]) @@ -108,7 +108,7 @@ [AC_MSG_CHECKING([for jpeglib]) AC_CACHE_VAL(ac_cv_lib_jpeg, [ac_save_LIBS="$LIBS" -@@ -304,7 +268,7 @@ +@@ -304,7 +268,7 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg` fi ]) @@ -117,7 +117,7 @@ [ AC_MSG_CHECKING([for bool]) AC_CACHE_VAL(ac_cv_have_bool, -@@ -321,7 +285,7 @@ +@@ -321,7 +285,7 @@ AC_DEFUN(AC_CHECK_BOOL, fi ]) @@ -126,7 +126,7 @@ [ AC_MSG_CHECKING(if you need GNU extensions) AC_CACHE_VAL(ac_cv_gnu_extensions, -@@ -349,7 +313,7 @@ +@@ -349,7 +313,7 @@ if test "$ac_cv_gnu_extensions" = "yes"; fi ]) @@ -135,7 +135,7 @@ [ dnl this is somehow a fat lie, but prevents other macros from double checking AC_PROVIDE([AC_PROG_CC]) -@@ -372,9 +336,6 @@ +@@ -372,9 +336,6 @@ dnl this was AC_PROG_CC. I had to includ if test -z "$CC"; then AC_CHECK_PROG(CC, xlc, xlc) fi test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) @@ -145,7 +145,7 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes else -@@ -383,7 +344,6 @@ +@@ -383,7 +344,6 @@ dnl this was AC_PROG_CC. I had to includ if test -z "$CFLAGS"; then if test "$ac_use_debug_code" = "yes"; then @@ -153,7 +153,7 @@ if test $ac_cv_prog_cc_g = yes; then CFLAGS="-g" fi -@@ -447,9 +407,6 @@ +@@ -447,9 +407,6 @@ dnl dependecies between AC_PROG_CPP and if test -z "$CXX"; then AC_CHECK_PROG(CXX, DCC, DCC) fi test -z "$CXX" && AC_MSG_ERROR([no acceptable C++-compiler found in \$PATH]) @@ -163,7 +163,7 @@ if test $ac_cv_prog_gxx = yes; then GXX=yes else -@@ -472,10 +429,6 @@ +@@ -472,10 +429,6 @@ EOF if test -z "$CXXFLAGS"; then if test "$ac_use_debug_code" = "yes"; then @@ -174,7 +174,7 @@ if test "$ac_cv_prog_CC" = "yes"; then CXXFLAGS="$CXXFLAGS -pto" fi -@@ -499,7 +452,7 @@ +@@ -499,7 +452,7 @@ EOF ]) dnl just a wrapper to clean up configure.in @@ -183,7 +183,7 @@ [ dnl libtool is only for C, so I must force him dnl to find the correct flags for C++ -@@ -515,7 +468,7 @@ +@@ -515,7 +468,7 @@ CFLAGS=$ac_save_cflags ]) dnl Check for the type of the third argument of getsockname @@ -192,7 +192,7 @@ [AC_MSG_CHECKING(for the third argument of getsockname) AC_LANG_CPLUSPLUS AC_CACHE_VAL(ac_cv_ksize_t_int, -@@ -536,21 +489,10 @@ +@@ -536,21 +489,10 @@ fi dnl From Jim Meyering. Use this if you use the GNU error.[ch]. dnl FIXME: Migrate into libit @@ -215,7 +215,7 @@ [AC_REQUIRE_CPP()dnl test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= -@@ -601,7 +543,7 @@ +@@ -601,7 +543,7 @@ AC_DEFUN(AC_HAVE_XPM, AC_SUBST(XPMLIB) ]) @@ -224,7 +224,7 @@ [AC_REQUIRE_CPP()dnl test -z "$GL_LDFLAGS" && GL_LDFLAGS= -@@ -655,7 +597,7 @@ +@@ -655,7 +597,7 @@ AC_DEFUN(AC_HAVE_GL, dnl PAM pam dnl Should test for PAM (Pluggable Authentication Modules) @@ -233,7 +233,7 @@ [test -z "$pam_direct_test_library" && pam_direct_test_library=pam test -z "$pam_direct_test_library" && pam_direct_test_library=pam_misc test -z "$pam_direct_test_library" && pam_direct_test_library=dl -@@ -709,7 +651,7 @@ +@@ -709,7 +651,7 @@ AC_DEFUN(AC_HAVE_GL, LIBS="$ac_save_LIBS" ]) @@ -242,7 +242,7 @@ [AC_REQUIRE_CPP()dnl pam_includes=NONE -@@ -763,7 +705,7 @@ +@@ -763,7 +705,7 @@ AC_DEFUN(AC_PATH_PAM, ]) @@ -251,7 +251,7 @@ [ AC_CHECK_LIB(dl, dlopen, [ LIBDL="-ldl" -@@ -815,7 +757,7 @@ +@@ -815,7 +757,7 @@ fi ]) @@ -260,7 +260,7 @@ [ KDE_CHECK_DLOPEN(libtool_enable_shared=no, libtool_enable_static=no) KDE_PROG_LIBTOOL -@@ -834,237 +776,3 @@ +@@ -834,237 +776,3 @@ else $2 fi ]) @@ -504,21 +504,40 @@ INCLUDES= -I$(topdir) $(all_includes) -LDADD = -L$(topdir)/xbase/.libs -lxbase -+LDADD = -L$(topdir)/xbase/ -lxbase ++LDADD = $(topdir)/xbase/libxbase.la INSTALL_PROGRAM = @INSTALL@ --- configure.in +++ configure.in -@@ -4,6 +4,7 @@ - AC_INIT(acinclude.m4) dnl a source file from your sub dir, but acinclude.m4 does the job - AC_CANONICAL_SYSTEM - AC_ARG_PROGRAM +@@ -15,18 +15,20 @@ dnl generate the config header + AM_CONFIG_HEADER(xbase/xbconfig.h) dnl at the distribution this done + + dnl Checks for programs. +-AC_CHECK_COMPILERS +-KDE_PROG_LIBTOOL ++AC_PROG_CC ++AC_PROG_CXX ++ ++dnl find out some variables ++AC_USE_SYSTEM_EXTENSIONS ++ ++AC_ENABLE_SHARED(yes) +AC_PROG_LIBTOOL - XSUBDIRS="xbase examples bin html libtest tv" - AC_SUBST(XSUBDIRS) -@@ -52,7 +53,6 @@ + AC_CHECK_PROG(doxygen, doxygen, yes, no) + if test "$doxygen" = "yes"; then + XSUBDIRS="$XSUBDIRS docs" + fi + +-dnl find out some variables +-AC_AIX +-AC_MINIX +- + dnl for NLS support. Call them in this order! + AC_LANG_CPLUSPLUS dnl switch to C++ + +@@ -52,7 +54,6 @@ AC_CHECK_FUNCS(flock) dnl AC_CHECK_FUNCS(fcntl) AC_CHECK_FUNCS(snprintf) dnl AC_CHECK_FUNCS(socket vsnprintf vsprintf) @@ -526,7 +545,7 @@ AC_LANG_CPLUSPLUS AC_CHECK_FUNCS(getdomainname) AC_CHECK_FUNCS(strcasecmp) -@@ -62,9 +62,6 @@ +@@ -62,9 +63,6 @@ AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL AC_SUBST(LIBSOCKET) AC_SUBST(LIBNSL) @@ -536,7 +555,16 @@ AC_ARG_WITH(index-ndx, [ --without-index-ndx do not compile .ndx index support ], enable_index_ndx="$withval", enable_index_ndx="yes") if test "$enable_index_ndx" = "yes"; then AC_DEFINE(XB_INDEX_NDX,1) -@@ -133,23 +130,18 @@ +@@ -72,7 +70,7 @@ fi + + AC_ARG_WITH(index-ntx, [ --without-index-ntx do not compile .ntx index support ], enable_index_ntx="$withval", enable_index_ntx="yes") + if test "$enable_index_ntx" = "yes"; then +- AC_DEFINE(XB_INDEX_NTX,1)~ ++ AC_DEFINE(XB_INDEX_NTX,1) + fi + + AC_ARG_WITH(memo-fields, [ --without-memo-fields do not compile memo fields support ], enable_memo_fields="$withval", enable_memo_fields="yes") +@@ -133,23 +131,18 @@ fi AC_SUBST(TVPROGS) dnl add here all your Makefiles @@ -580,7 +608,7 @@ INCLUDES= -I$(topdir) $(all_includes) -LDADD = -L$(topdir)/xbase/.libs -lxbase -+LDADD = -L$(topdir)/xbase/ -lxbase ++LDADD = $(topdir)/xbase/libxbase.la # for shadow passwords override the value INSTALL_PROGRAM = @INSTALL@ @@ -590,17 +618,17 @@ INCLUDES= -I$(topdir) $(all_includes) -LDADD = -L$(topdir)/xbase/.libs -lxbase -+LDADD = -L$(topdir)/xbase/ -lxbase ++LDADD = $(topdir)/xbase/libxbase.la INSTALL_PROGRAM = @INSTALL@ --- tv/Makefile.am +++ tv/Makefile.am -@@ -24,6 +24,6 @@ +@@ -24,6 +24,6 @@ noinst_PROGRAMS = @TVPROGS@ EXTRA_PROGRAMS = tvxbase tvxbase_SOURCES = tvxbase.cpp tvbrowse.cpp tvbrowse.h -tvxbase_LDADD = -L$(topdir)/xdb/.libs -lxdb -ltvision -lgpm -+tvxbase_LDADD = -L$(topdir)/xdb/ -lxdb -ltvision -lgpm ++tvxbase_LDADD = $(topdir)/xdb/libxdb.la -ltvision -lgpm MAINTAINERCLEANFILES = Makefile.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org