rpms/qof/FC-4 qof-0.6.1-build.patch, NONE, 1.1 qof-dependencies.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qof.spec, 1.9, 1.10 sources, 1.2, 1.3 qof-libxml-dependency.patch, 1.1, NONE qof-linker-dependency.patch, 1.1, NONE

Sun Jan 15 18:40:10 UTC 2006

Author: toshio

Update of /cvs/extras/rpms/qof/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Removed Files:
	qof-libxml-dependency.patch qof-linker-dependency.patch 
Log Message:
* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
- Upgrade to 0.6.1.
- Drop patches integrated upstream.
- Remove static libs.
- Patch to add dependencies to the pkgconfig file and linked to the library.
- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
  used.  Also fix the make targets to build tests separately from the library.
- Enable %check as it works with the previous patch.
  
* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
- Upgrade to 0.6.0.
- Drop patches integrated upstream.
- Small patches for x86_64 and gcc4.
- Patch to work around upstream thinko regarding how gmodule works.


qof-0.6.1-build.patch:

--- NEW FILE qof-0.6.1-build.patch ---
Index: qof-0.6.1/qof/test/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.am
+++ qof-0.6.1/qof/test/Makefile.am
@@ -21,7 +21,6 @@ LDADD = \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
    ${LIBGDA_LIBS} \
-   -lltdl \
    -lm
 else
 LDADD = \
@@ -31,7 +30,6 @@ LDADD = \
    ${GLIB_LIBS} \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
-   -lltdl \
    -lm
 endif
 
@@ -60,7 +58,7 @@ test_querynew_SOURCES = \
   test-stuff.c \
   test-querynew.c
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
   test-book-merge \
   test-date \
   test-guid \
Index: qof-0.6.1/qof/test/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.in
+++ qof-0.6.1/qof/test/Makefile.in
@@ -36,9 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-book-merge$(EXEEXT) test-date$(EXEEXT) \
-	test-guid$(EXEEXT) test-numeric$(EXEEXT) test-object$(EXEEXT) \
-	test-querynew$(EXEEXT)
+noinst_PROGRAMS =
 subdir = qof/test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -356,7 +354,6 @@ INCLUDES = \
 @USE_LIBGDA_FALSE@   ${GLIB_LIBS} \
 @USE_LIBGDA_FALSE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_FALSE@   ${GOBJECT_LIBS} \
- at USE_LIBGDA_FALSE@   -lltdl \
 @USE_LIBGDA_FALSE@   -lm
 
 @USE_LIBGDA_TRUE at LDADD = \
@@ -366,7 +363,6 @@ INCLUDES = \
 @USE_LIBGDA_TRUE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_TRUE@   ${GOBJECT_LIBS} \
 @USE_LIBGDA_TRUE@   ${LIBGDA_LIBS} \
- at USE_LIBGDA_TRUE@   -lltdl \
 @USE_LIBGDA_TRUE@   -lm
 
 test_book_merge_SOURCES = \

qof-dependencies.patch:

--- NEW FILE qof-dependencies.patch ---
Index: qof-0.6.1/configure.in
===================================================================
--- qof-0.6.1.orig/configure.in
+++ qof-0.6.1/configure.in
@@ -127,20 +127,23 @@ if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
 	ADD_PKG_LIB="-lqofsql"
+	GDA_PKG_LIB=""
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
     GDA_VERSION=`$PKG_CONFIG --modversion libgda`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	ADD_PKG_LIB="-lgda-2"
+    ADD_PKG_LIB=""
+    GDA_PKG_LIB="libgda"
     HAVE_GDA="use_gda"
-	AC_SUBST(GDA_VERSION)
+    AC_SUBST(GDA_VERSION)
 fi
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])
 AC_SUBST(USE_LIBGDA)
 AC_SUBST(ADD_PKG_LIB)
+AC_SUBST(GDA_PKG_LIB)
 
 dnl **************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics.
Index: qof-0.6.1/qof-1.pc.in
===================================================================
--- qof-0.6.1.orig/qof-1.pc.in
+++ qof-0.6.1/qof-1.pc.in
@@ -8,7 +8,7 @@ added_libs=@ADD_PKG_LIB@
 
 Name: QOF
 Description: QOF Query Object Framework Library.
-Requires: glib-2.0 libxml-2.0 >= 2-2.5.10
+Requires: glib-2.0 libxml-2.0 >= 2-2.5.10 gobject-2.0 gmodule-2.0 @GDA_PKG_LIB@
 Version: @VERSION@
-Libs: -L${libdir} -lqof ${added_libs}
+Libs: -L${libdir} -lqof -lm ${added_libs}
 Cflags: -I${includedir}/qof
Index: qof-0.6.1/qof/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/Makefile.am
+++ qof-0.6.1/qof/Makefile.am
@@ -96,10 +96,12 @@ INCLUDES = \
   -DDATADIR=\""$(datadir)"\"
 endif
 
-LDADD = \
+libqof_la_LIBADD = \
   ${LIBGDA_LIBS} \
   ${GMODULE_LIBS} \
-  ${GLIB_LIBS}
+  ${GOBJECT_LIBS} \
+  ${GLIB_LIBS} \
+  -lm
 
 EXTRA_DIST = \
   qofla-dir.h.in \
Index: qof-0.6.1/qof/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/Makefile.in
+++ qof-0.6.1/qof/Makefile.in
@@ -61,7 +61,11 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libqof_la_LIBADD =
+libqof_la_LIBADD = ${LIBGDA_LIBS} \
+		   ${GMODULE_LIBS} \
+		   ${GOBJECT_LIBS} \
+		   ${GLIB_LIBS} \
+		   -lm
 am_libqof_la_OBJECTS = gnc-date.lo gnc-engine-util.lo gnc-numeric.lo \
 	gnc-event.lo qoflog.lo guid.lo kvp_frame.lo kvp-util.lo md5.lo \
 	qofbackend.lo qofclass.lo qofchoice.lo qofgobj.lo qofid.lo \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:59 -0000	1.2
+++ .cvsignore	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-qof-0.5.0.tar.gz
+qof-0.6.1.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qof.spec	23 Mar 2005 13:06:11 -0000	1.9
+++ qof.spec	15 Jan 2006 18:40:10 -0000	1.10
@@ -1,27 +1,24 @@
 Name:           qof
-Version:        0.5.0
-Release:        5
-Summary:        QOF provides a query engine library for C objects
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Adds libxml-2.0 as a dependent library to the pkg-config entry.
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/qof-libxml-dependency.patch
-# Adds libxml2 and glib to the library link so rpm can auto-detect depends.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
+Patch0:		qof-0.6.1-build.patch
+Patch1:		qof-dependencies.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
+BuildRequires: libgda-devel
 BuildRequires: intltool
-# These are needed to compile the example programs.  I don't want the compiled
-# programs anyway so when we disable that we can get rid of these two.
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk2-devel
-# Patch1 changes a Makefile.am so we have to regenerate the build files.
-BuildRequires: libtool
+# qof doesn't ship with pre-built documentation
+BuildRequires: doxygen
+# Patch1 modifies configure.in so we have to use autoconf
+BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -35,12 +32,26 @@
 query engine can be backed by an actual database, so that instances
 of local objects can act as a 'cache' to a much larger SQL database.
 
+%package	docs
+Summary:	API documentation for libqof
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+%description	docs
+QOF - The Query Object Framework is a C library that provides a query engine
+to C applications.  This allows SQL-like queries to be performes on a
+collection of C/C++ objects (which act like SQL tables).
+
+This package contains API documentation for programming against libqof.
+Install this package if you need information on writing a program that uses
+libqof.
+
 %package        devel
 Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
 Requires:       glib2-devel
+Requires:	libgda-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -48,25 +59,25 @@
 to C applications.  This allows SQL-like queries to be performes on a
 collection of C/C++ objects (which act like SQL tables).
 
-This package contains the header files, static libraries, examples, and
-documentation to develop programs that will use the qof library.  You should
+This package contains the header files and  static libraries to develop
+programs that will use the qof library.  You should
 install this package if you need to develop programs which will use the qof
 library functions.  You'll also need to install the qof package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-# The build architecture in the 0.5.0 release is somewhat broken.  Upstream
-# cvs has moved files from src/ to qof/ to address this.  This symlink
-# simulates that until a fixed version is released.
-ln -sf src qof
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf --force --install
-%configure
+autoconf --force
+%configure --disable-static
 make
 
+# qof doesn't build the documentation unless you build the doc target.
+# The doc target isn't written correctly either.
+cd doc; make doc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,16 +87,12 @@
 
 # Get documentation ready to ship
 mv doc/html .
-cd examples
-make clean
-rm -rf .deps .cvsignore
-cd gobject
-rm -rf .deps .cvsignore
+rm html/installdox
 
-%check || :
-#make test
-#make check
+%find_lang %{name}
 
+%check || :
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,20 +101,43 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_libdir}/*.so.*
+%{_datadir}/xml/qof/
 
 %files devel
 %defattr(-,root,root,0755)
-%doc html examples
+%doc ChangeLog
 %{_includedir}/qof
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc html
+
 %changelog
+* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
+- Upgrade to 0.6.1.
+- Drop patches integrated upstream.
+- Remove static libs.
+- Patch to add dependencies to the pkgconfig file and linked to the library.
+- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
+  used.  Also fix the make targets to build tests separately from the library.
+- Enable %%check as it works with the previous patch.
+  
+* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
+- Upgrade to 0.6.0.
+- Drop patches integrated upstream.
+- Small patches for x86_64 and gcc4.
+- Patch to work around upstream thinko regarding how gmodule works.
+
+* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-6
+- Add dist tag.
+- Rebuild for devel (FC5).
+
 * Wed Mar 23 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-5
 - ltdl-devel package is libtool-ltdl-devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:59 -0000	1.2
+++ sources	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-a4937d0ad42d3b776b58bb7ee2505823  qof-0.5.0.tar.gz
+2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz


--- qof-libxml-dependency.patch DELETED ---


--- qof-linker-dependency.patch DELETED ---


