Author: freetz Date: Fri Aug 11 18:33:21 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from gda-1_2 branch, use HEAD deps, apidocs subpkg added,
changelog cut, unstable version moved to DEVEL branch
---- Files affected:
SPECS:
libgda.spec (1.105 -> 1.106)
---- Diffs:
================================================================
Index: SPECS/libgda.spec
diff -u SPECS/libgda.spec:1.105 SPECS/libgda.spec:1.106
--- SPECS/libgda.spec:1.105 Fri Jul 14 22:18:27 2006
+++ SPECS/libgda.spec Fri Aug 11 20:33:16 2006
@@ -1,13 +1,7 @@
# $Revision$, $Date$
#
-# TODO: package dotnet-gda-sharp
-#
# Conditional build:
-%bcond_without doc # don't generate html documentation
-%bcond_without static_libs # don't build static libraries
-%bcond_with gamin # use gamin instead of fam library
-#
-%bcond_without firebird # build without firebird plugin
+%bcond_with firebird # build without firebird plugin
%bcond_without freetds # build without freetds plugin
%bcond_without ldap # build without ldap plugin
%bcond_without mdb # build without MDB plugin
@@ -16,60 +10,55 @@
%bcond_without pgsql # build without PostgreSQL plugin
%bcond_without sqlite # build without sqlite plugin
%bcond_without xbase # build without xbase plugin
-#
-%ifnarch %{ix86} sparc sparcv9 alpha
+
+%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
%undefine with_firebird
%endif
Summary: GNU Data Access library
Summary(pl): Biblioteka GNU Data Access
Name: libgda
-Version: 1.9.100
-Release: 7
+Version: 1.2.3
+Release: 3
+Epoch: 1
License: LGPL v2/GPL v2
Group: Applications/Databases
-Source0:
http://ftp.gnome.org/pub/gnome/sources/libgda/1.9/%{name}-%{version}.tar.bz2
-# Source0-md5: c943610dc4c9c286bb14d6ce3c6e549b
-Patch0: %{name}-freetds_buildfix.patch
+Source0:
http://ftp.gnome.org/pub/gnome/sources/libgda/1.2/%{name}-%{version}.tar.bz2
+# Source0-md5: eb9c31c3102d542de728f5f55674d511
+Patch0: %{name}-gcc34.patch
Patch1: %{name}-mdb.patch
-Patch2: %{name}-include.patch
-Patch3: %{name}-rename.patch
-Patch4: %{name}-typo.patch
-Patch5: %{name}-update.patch
-Patch6: %{name}-xbase.patch
-Patch7: %{name}-configure.patch
+Patch2: %{name}-freetds063.patch
+Patch3: %{name}-sqlite.patch
+Patch4: %{name}-configure.patch
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
BuildRequires: bison
BuildRequires: db-devel
-%{!?with_gamin:BuildRequires: fam-devel}
BuildRequires: flex
%{?with_freetds:BuildRequires: freetds-devel >= 0.63}
-%{?with_gamin:BuildRequires: gamin-devel}
-BuildRequires: glib2-devel >= 1:2.12.0
+BuildRequires: glib2-devel >= 1:2.12.1
BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gtk-doc >= 1.6
+BuildRequires: gtk-doc >= 1.7
BuildRequires: intltool >= 0.35
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:.2.6.26
+BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: libxslt-devel >= 1.1.17
%{?with_mdb:BuildRequires: mdbtools-devel}
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
+%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: perl-base
BuildRequires: popt-devel
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: readline-devel >= 5.0
BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: scrollkeeper
%{?with_sqlite:BuildRequires: sqlite3-devel}
%{?with_odbc:BuildRequires: unixODBC-devel}
%{?with_xbase:BuildRequires: xbase-devel >= 2.0.0}
-%{!?with_gamin:BuildConflicts: gamin-devel}
+Requires(post,postun): scrollkeeper
+Requires: scrollkeeper
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libgdadir %{name}-%(echo %{version} | cut -d '.'
-f 1-2 )
-%define _providersdir %{_libdir}/%{_libgdadir}/providers
-
%description
GNU Data Access is an attempt to provide uniform access to different
kinds of data sources (databases, information servers, mail spools,
@@ -92,11 +81,8 @@
Summary: GNU Data Access development
Summary(pl): Dla programistów GNU Data Access
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-%{!?with_gamin:Requires: fam-devel}
-%{?with_gamin:Requires: gamin-devel}
-Requires: glib2-devel >= 1:2.12.0
-Requires: gtk-doc-common
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: glib2-devel >= 1:2.12.1
Requires: libxml2-devel >= 1:2.6.26
Requires: libxslt-devel >= 1.1.17
Obsoletes: libgda0-devel
@@ -130,7 +116,7 @@
Summary: GDA Berkeley DB provider
Summary(pl): Źródło danych Berkeley DB dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-db
This package contains the GDA Berkeley DB provider.
@@ -142,7 +128,7 @@
Summary: GDA Firebird provider
Summary(pl): Źródło danych Firebird dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-firebird
This package contains the GDA Firebird provider.
@@ -154,7 +140,7 @@
Summary: GDA FreeTDS provider
Summary(pl): Źródło danych FreeTDS dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-freetds
This package contains the GDA FreeTDS provider.
@@ -166,7 +152,7 @@
Summary: GDA LDAP provider
Summary(pl): Źródło danych LDAP dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-ldap
This package contains the GDA LDAP provider.
@@ -178,7 +164,7 @@
Summary: GDA MDB provider
Summary(pl): Źródło danych MDB
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-mdb
This package contains the GDA MDB provider.
@@ -190,7 +176,7 @@
Summary: GDA MySQL provider
Summary(pl): Źródło danych MySQL dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: libgda-mysql0
%description -n gda-mysql
@@ -203,7 +189,7 @@
Summary: GDA ODBC provider
Summary(pl): Źródło danych ODBC dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-odbc
This package contains the GDA ODBC provider.
@@ -215,7 +201,7 @@
Summary: GDA PostgreSQL provider
Summary(pl): Źródło danych PostgreSQL dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: libgda-postgres0
%description -n gda-postgres
@@ -228,7 +214,7 @@
Summary: GDA SQLite provider
Summary(pl): Źródło danych SQLite dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-sqlite
This package contains the GDA SQLite provider.
@@ -240,7 +226,7 @@
Summary: GDA xBase provider
Summary(pl): Źródło danych xBase dla GDA
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n gda-xbase
This package contains the GDA xBase (dBase, Clipper, FoxPro) provider.
@@ -248,16 +234,25 @@
%description -n gda-xbase -l pl
Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro) dla GDA.
+%package apidocs
+Summary: libgda API documentation
+Summary(pl): Dokumentacja API libgda
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+libgda API documentation.
+
+%description apidocs -l pl
+Dokumentacja API libgda.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
@@ -266,10 +261,8 @@
%{__aclocal}
%{__autoconf}
%{__automake}
-LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure \
- %{?with_doc:--enable-gtk-doc} \
- %{!?with_static_libs:--enable-static=no} \
+ --enable-gtk-doc \
--with-html-dir=%{_gtkdocdir} \
--with%{!?with_firebird:out}-firebird \
--with%{!?with_ldap:out}-ldap \
@@ -288,10 +281,10 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- HTML_DIR=%{_gtkdocdir}
+ HTML_DIR=%{_gtkdocdir}
# modules dlopened by *.so through libgmodule
-rm -f $RPM_BUILD_ROOT%{_providersdir}/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgda/providers/*.{a,la}
rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
@@ -300,21 +293,28 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%scrollkeeper_update_post
+
+%postun
+/sbin/ldconfig
+%scrollkeeper_update_postun
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/gda-config-tool
-%attr(755,root,root) %{_libdir}/libgda-3.so.*.*
-%attr(755,root,root) %{_libdir}/libgda-report-3.so.*.*
+%attr(755,root,root) %{_libdir}/libgda-2.so.*.*
+%attr(755,root,root) %{_libdir}/libgda-report-2.so.*.*
%attr(755,root,root) %{_libdir}/libgdasql.so.*.*
-%dir %{_libdir}/%{_libgdadir}
-%dir %{_providersdir}
+%dir %{_libdir}/libgda
+%dir %{_libdir}/libgda/providers
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-xml.so
%{_datadir}/libgda
+%{_omf_dest_dir}/%{name}
%dir %{_sysconfdir}/libgda
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libgda/config
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/libgda/config
%{_mandir}/man1/gda-config-tool.1*
%{_mandir}/man5/*
@@ -323,78 +323,79 @@
%attr(755,root,root) %{_bindir}/gda-report-test
%attr(755,root,root) %{_bindir}/gda-run
%attr(755,root,root) %{_bindir}/gda-test
-%attr(755,root,root) %{_libdir}/libgda-3.so
-%attr(755,root,root) %{_libdir}/libgda-report-3.so
+%attr(755,root,root) %{_libdir}/libgda-2.so
+%attr(755,root,root) %{_libdir}/libgda-report-2.so
%attr(755,root,root) %{_libdir}/libgdasql.so
-%{_libdir}/libgda-3.la
-%{_libdir}/libgda-report-3.la
+%{_libdir}/libgda-2.la
+%{_libdir}/libgda-report-2.la
%{_libdir}/libgdasql.la
-%{_includedir}/libgda-1.9
+%{_includedir}/libgda-1.2
%{_pkgconfigdir}/*
-%{?with_doc:%{_gtkdocdir}/*}
-%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/lib*.a
-%endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/*
%files -n gda-db
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-bdb.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-bdb.so
%if %{with firebird}
%files -n gda-firebird
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-firebird.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-firebird.so
%endif
%if %{with freetds}
%files -n gda-freetds
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-freetds.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-freetds.so
%endif
%if %{with ldap}
%files -n gda-ldap
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-ldap.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-ldap.so
%endif
%if %{with mdb}
%files -n gda-mdb
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-mdb.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-mdb.so
%endif
%if %{with mysql}
%files -n gda-mysql
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-mysql.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-mysql.so
%endif
%if %{with odbc}
%files -n gda-odbc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-odbc.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-odbc.so
%endif
%if %{with pgsql}
%files -n gda-postgres
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-postgres.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-postgres.so
%endif
%if %{with sqlite}
%files -n gda-sqlite
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-sqlite.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-sqlite.so
%endif
%if %{with xbase}
%files -n gda-xbase
%defattr(644,root,root,755)
-%attr(755,root,root) %{_providersdir}/libgda-xbase.so
+%attr(755,root,root) %{_libdir}/libgda/providers/libgda-xbase.so
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -403,63 +404,7 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.105 2006/07/14 20:18:27 freetz
-- rel.7, updated deps, --as-needed support
-
-Revision 1.104 2006/03/27 12:41:43 glen
-- rel 6 (libmysqlclient_15)
-
-Revision 1.103 2006/03/23 19:32:55 freetz
-- disabled firebird on ppc/x86_64, added configure patch, rel.5
-
-Revision 1.102 2006/02/21 23:10:26 qboosh
-- it uses fam/gamin (libgamin is preferred by configure)
-
-Revision 1.101 2006/02/21 20:57:09 qboosh
-- release 4
-
-Revision 1.100 2006/02/21 20:53:08 qboosh
-- added typo,update,xbase patches to kill unresolved symbols in
- bdb,firebird,freetds,ldap,postgres,xbase providers
-
-Revision 1.99 2006/01/17 15:15:01 baggins
-- release 3
-- BR openldap 2.3
-
-Revision 1.98 2005/12/13 11:54:17 glen
-- adalterized (sorted %verify flags)
-
-Revision 1.97 2005/10/25 12:44:37 freetz
-- rename patch added:
- libgda/gda-threader.h: Rename GDA_THREADER_TYPE to
- GDA_TYPE_THREADER, so it matches the convention, for
- language bindings
-- rel.2
-
-Revision 1.96 2005/10/20 10:16:21 qboosh
-- removed outdated gcc34 patch
-- updated freetds_buildfix patch (no need to apply it conditionally)
-- reenabled freetds and firebird
-
-Revision 1.95 2005/10/19 19:29:52 freetz
-- merged from DEVEL
-
-Revision 1.91.2.6 2005/10/19 19:21:16 freetz
-- 1.9.100
-
-Revision 1.91.2.5 2005/09/20 11:10:10 aflinta
-- rebuild with readline 5.0
-
-Revision 1.91.2.4 2005/08/16 11:32:22 freetz
-- 1.3.91, even more breakage introduced in this release
-- removed obsoleted bdb and gcc4 patches, added include patch
- still 0.1 due postgres backend segfault, freetds 0.6x still unsupported
-
-Revision 1.91.2.3 2005/07/11 15:37:31 freetz
-- fixed typo
-
-Revision 1.91.2.2 2005/07/11 15:31:39 freetz
-- do not apply freetds patch --without freetds (note added)
+Revision 1.106 2006/08/11 18:33:16 freetz
+- merged from gda-1_2 branch, use HEAD deps, apidocs subpkg added,
+ changelog cut, unstable version moved to DEVEL branch
-Revision 1.91.2.1 2005/07/09 21:08:18 twittner
-- up to 1.3.3 (NFY - -freetds_buildfix.patch)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/libgda.spec?r1=1.105&r2=1.106&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
