diff --git a/.cvsignore b/.cvsignore index 6bfde71..8901720 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgda-4.0.8.tar.bz2 +libgda-4.1.6.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..a8a8f0d --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libgda-4_1_6-1_fc14:EL-6:libgda-4.1.6-1.fc14.src.rpm:1278623782 diff --git a/libgda.spec b/libgda.spec index 602e62c..e7fabdb 100644 --- a/libgda.spec +++ b/libgda.spec @@ -12,7 +12,7 @@ # --without tds # --without xbase # --without java -# +# %define IBMDB2 0 %define ORACLE 0 @@ -40,7 +40,7 @@ Name: libgda Epoch: 1 -Version: 4.0.8 +Version: 4.1.6 Release: 1%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries @@ -52,16 +52,23 @@ Patch3: libgda-3.99.8-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.16 +BuildRequires: gtk2-devel >= 2.20.0 +BuildRequires: unique-devel >= 1.1.6 +BuildRequires: gtksourceview2-devel >= 2.10.0 +BuildRequires: goocanvas-devel >= 0.15 +BuildRequires: graphviz-devel >= 2.26.0 +BuildRequires: iso-codes >= 3.15 BuildRequires: libxslt-devel >= 1.0.9 BuildRequires: sqlite-devel >= 3.6.0 BuildRequires: gamin-devel >= 0.1.8 BuildRequires: libtool -BuildRequires: gir-repository-devel >= 0.6.5 BuildRequires: gobject-introspection-devel >= 0.6.5 BuildRequires: libxml2-devel readline-devel db4-devel json-glib-devel BuildRequires: gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser) BuildRequires: gnome-vfs2-devel >= 2.20 BuildRequires: libsoup-devel +BuildRequires: java-1.6.0-openjdk >= 1.6.0.0 +BuildRequires: gnome-doc-utils # note we do not provide these, they no longer exist Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release} Obsoletes: %{name}-sharp-devel < %{epoch}:%{version}-%{release} @@ -124,6 +131,32 @@ Requires: %{name} = %{epoch}:%{version}-%{release} This package contains the header files and libraries needed to write or compile programs that use libgda. +%package ui +Summary: Libgda UI extensions +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description ui +libgda-ui extends libgda providing graphical widgets (Gtk+). + +%package ui-devel +Summary: Development libraries and header files for libgda-ui +Group: Development/Libraries +Requires: %{name}-ui = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: gtk2-devel >= 2.20.0 + +%description ui-devel +This package contains the header files and libraries needed to write +or compile programs that use libgda-ui. + +%package tools +Summary: Graphical tools for libgda +Group: Applications/Databases +Requires: %{name}-ui = %{epoch}:%{version}-%{release} + +%description tools +This package provides libgda graphical tools. %package sqlite Summary: SQLite provider for libgda @@ -142,6 +175,21 @@ Requires: %{name}-sqlite = %{epoch}:%{version}-%{release} %description sqlite-devel This package includes the pkgconfig file for the libgda SQLite provider. +%package web +Summary: web provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +%description web +This package includes the libgda web provider. + +%package web-devel +Summary: web provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-web = %{epoch}:%{version}-%{release} +%description web-devel +This package includes the pkgconfig file for the libgda web provider. + %if %{FREETDS} %package freetds @@ -294,7 +342,7 @@ Requires: %{name}-mdb = %{epoch}:%{version}-%{release} %description mdb-devel This package includes the pkgconfig file for the libgda MDB provider. %endif - + %if %{LDAP} %package ldap Summary: LDAP provider for libgda @@ -433,14 +481,15 @@ CONFIG="$CONFIG --without-java" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # workaround to fix linking failure for GI -export LD_LIBRARY_PATH=`pwd`/libgda/.libs:`pwd`/libgda-report/.libs +export LD_LIBRARY_PATH=`pwd`/libgda/.libs:`pwd`/libgda-report/.libs:`pwd`/libgda-ui/.libs make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - +# libgda/libgda.h is not installed ? +mv %{name}/%{name}.h $RPM_BUILD_ROOT/%{_includedir}/%{name}-4.0/%{name}/%{name}.h # Cleanup unnecessary, unpackaged files find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-4.0/sales_test.db @@ -467,36 +516,98 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README NEWS %config(noreplace) %{_sysconfdir}/libgda-4.0 -%{_bindir}/* -%{_datadir}/libgda-4.0 -%{_libdir}/*.so.* -%dir %{_libdir}/libgda-4.0 -%dir %{_libdir}/libgda-4.0/providers +%{_bindir}/gda-list-*-4.0 +%{_bindir}/gda-sql-4.0 +%{_bindir}/gda-test-connection-4.0 +%{_bindir}/gda_trml2* +%{_datadir}/libgda-4.0/dtd/libgda-*.dtd +%{_datadir}/%{name}-4.0/language-specs +%{_datadir}/%{name}-4.0/import_encodings.xml +%{_datadir}/%{name}-4.0/information_schema.xml +%{_libdir}/%{name}-4.0.so.* +%{_libdir}/%{name}-report-4.0.so.* +%{_libdir}/%{name}-xslt-4.0.so.* +%dir %{_libdir}/%{name}-4.0 +%dir %{_libdir}/%{name}-4.0/providers # note this file really should be in its own subpackage too, but libgda # needs to have atleast one provider present to be of any use. %{_libdir}/libgda-4.0/providers/libgda-bdb.so +%{_datadir}/%{name}-4.0/bdb_specs*.xml %{_libdir}/girepository-1.0/Gda-4.0.typelib %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %doc %{_datadir}/gtk-doc/html/libgda-4.0 -%{_includedir}/* -%{_libdir}/*.so +%{_includedir}/%{name}-4.0/%{name}/* +%{_includedir}/%{name}-4.0/%{name}-report/* +%{_includedir}/%{name}-4.0/%{name}-xslt/* +%{_libdir}/%{name}-4.0.so +%{_libdir}/%{name}-report-4.0.so +%{_libdir}/%{name}-xslt-4.0.so %{_libdir}/pkgconfig/libgda-4.0.pc %{_libdir}/pkgconfig/libgda-bdb-4.0.pc %{_libdir}/pkgconfig/libgda-report-4.0.pc %{_libdir}/pkgconfig/libgda-xslt-4.0.pc %{_datadir}/gir-1.0/Gda-4.0.gir +%files ui +%defattr(-,root,root,-) +%{_libdir}/%{name}-ui-4.0.so.* +%dir %{_libdir}/%{name}-4.0/plugins +%{_libdir}/%{name}-4.0/plugins/gdaui-*.xml +%{_libdir}/%{name}-4.0/plugins/libgda-ui-plugins.so +%{_datadir}/libgda-4.0/dtd/gdaui-layout.dtd +%{_datadir}/%{name}-4.0/server_operation.glade +%{_datadir}/%{name}-4.0/ui/gdaui-*.xml +%{_libdir}/girepository-1.0/Gdaui-4.0.typelib +%{_datadir}/%{name}-4.0/pixmaps/gdaui-generic.png + +%files ui-devel +%defattr(-,root,root,-) +%{_bindir}/gdaui-demo-4.0 +%{_includedir}/%{name}-4.0/%{name}-ui/* +%{_libdir}/%{name}-ui-4.0.so +%{_libdir}/pkgconfig/%{name}-ui-4.0.pc +# most of samples here requires libgda-ui +%{_datadir}/%{name}-4.0/demo/* +%{_datadir}/%{name}-4.0/pixmaps/bin-attachment-16x16.png +%{_datadir}/gir-1.0/Gdaui-4.0.gir + +%files tools +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/gda-browser +%{_bindir}/gda-browser-4.0 +%{_bindir}/gda-control-center-4.0 +%{_datadir}/applications/gda-browser-4.0.desktop +%{_datadir}/applications/gda-control-center-4.0.desktop +%{_datadir}/%{name}-4.0/icons/hicolor/* +%{_datadir}/%{name}-4.0/pixmaps/gda-browser*.png +%{_datadir}/%{name}-4.0/pixmaps/gda-control-center*.png +%{_datadir}/icons/hicolor/*/apps/gda-control-center.png +%{_datadir}/gnome/help/gda-browser/* +%{_datadir}/pixmaps/gda-browser-4.0.png + %files sqlite %defattr(-,root,root,-) -%{_libdir}/libgda-4.0/providers/libgda-sqlite.so +%{_libdir}/%{name}-4.0/providers/%{name}-sqlite.so +%{_datadir}/%{name}-4.0/sqlite_specs*.xml %files sqlite-devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/libgda-sqlite-4.0.pc +%files web +%defattr(-,root,root,-) +%{_libdir}/%{name}-4.0/providers/%{name}-web.so +%{_datadir}/%{name}-4.0/php/* +%{_datadir}/%{name}-4.0/web/* +%{_datadir}/%{name}-4.0/web_specs*.xml + +%files web-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/%{name}-web-4.0.pc + %if %{FREETDS} %files freetds %defattr(-,root,root,-) @@ -521,6 +632,7 @@ rm -rf $RPM_BUILD_ROOT %files mysql %defattr(-,root,root,-) %{_libdir}/libgda-4.0/providers/libgda-mysql.so +%{_datadir}/%{name}-4.0/mysql_specs*.xml %files mysql-devel %defattr(-,root,root,-) @@ -551,6 +663,7 @@ rm -rf $RPM_BUILD_ROOT %files postgres %defattr(-,root,root,-) %{_libdir}/libgda-4.0/providers/libgda-postgres.so +%{_datadir}/%{name}-4.0/postgres_specs*.xml %files postgres-devel %defattr(-,root,root,-) @@ -571,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT %files mdb %defattr(-,root,root,-) %{_libdir}/libgda-4.0/providers/libgda-mdb.so +%{_datadir}/%{name}-4.0/mdb_specs*.xml %files mdb-devel %defattr(-,root,root,-) @@ -602,6 +716,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libdir}/libgda-4.0/providers/libgda-jdbc.so %{_libdir}/libgda-4.0/providers/gdaprovider-4.0.jar +%{_datadir}/%{name}-4.0/jdbc_specs*.xml %files java-devel %defattr(-,root,root,-) @@ -610,13 +725,28 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 16 2010 Haïkel Guémar - 1:4.1.6-1 +- Update to upstream 4.1.6 +- Add new BR: gnome-doc-utils +- Dropped BR: gir-repository + +* Tue Apr 27 2010 Haïkel Guémar - 1:4.1.4-1 +- Update to upstream 4.1.4 (required by Glom) +- Added web provider and ui subpackages +- Added new BR (gtk2, unique, goocanvas, graphviz) for libgda-ui + +* Thu Apr 22 2010 Haïkel Guémar - 1:4.0.8-2 +- add gir descriptions files + * Thu Apr 22 2010 Haïkel Guémar - 1:4.0.8-1 - Update to upstream 4.0.8 -- add GObject introspection support + +* Thu Feb 18 2010 Denis Leroy - 1:4.0.7-1 +- Update to upstream 4.0.7 * Mon Jan 18 2010 Denis Leroy - 1:4.0.6-1 - Update to upstream 4.0.6 -- Added Java JDBC provider subpackage +- Added Java JDBC provider subpackage * Sat Nov 7 2009 Denis Leroy - 1:4.0.5-1 - Update to upstream 4.0.5 @@ -693,7 +823,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Aug 8 2007 Hans de Goede 1:3.0.1-2 - Build against system sqlite instead of own private copy (this is possible now - that the system sqlite is of a high enough version) + that the system sqlite is of a high enough version) - Enable FreeTDS provider (FreeTDS is in Fedora now) - Update License tag for new Licensing Guidelines compliance diff --git a/sources b/sources index 3192815..3102293 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e4a55f370805cda9ac415211da4aacc libgda-4.0.8.tar.bz2 +353dbf284ca7b43935a8fb8863b8391b libgda-4.1.6.tar.bz2