rpms/libgda/devel .cvsignore, 1.15, 1.16 libgda.spec, 1.59, 1.60 sources, 1.15, 1.16

Haïkel Guémar hguemar at fedoraproject.org
Wed Apr 28 00:40:38 UTC 2010


Author: hguemar

Update of /cvs/pkgs/rpms/libgda/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5653

Modified Files:
	.cvsignore libgda.spec sources 
Log Message:
upstream 4.1.4: new provider web and libgda-ui extensions


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Apr 2010 17:04:06 -0000	1.15
+++ .cvsignore	28 Apr 2010 00:40:36 -0000	1.16
@@ -1 +1 @@
-libgda-4.0.8.tar.bz2
+libgda-4.1.4.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libgda.spec	23 Apr 2010 18:14:19 -0000	1.59
+++ libgda.spec	28 Apr 2010 00:40:36 -0000	1.60
@@ -40,8 +40,8 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.0.8
-Release:          2%{?dist}
+Version:          4.1.4
+Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -52,6 +52,12 @@ Patch3:           libgda-3.99.8-lib64.pa
 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
@@ -62,6 +68,7 @@ BuildRequires:    libxml2-devel readline
 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
 # 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}:%{v
 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 = %{epo
 %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
@@ -433,17 +481,22 @@ 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
-
+mkdir $RPM_BUILD_ROOT%{_datadir}/gir-1.0/
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}-4.0/gir-1.0/Gda-4.0.gir \
+   $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Gda-4.0.gir
+# 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
+rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}-4.0/gir-1.0
 
 %find_lang libgda-4.0
 
@@ -467,36 +520,95 @@ 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
+%{_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
+
+%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}/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 +633,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 +664,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 +685,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 +717,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,6 +726,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 27 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 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 <hguemar at fedoraproject.org> - 1:4.0.8-2
 - add gir descriptions files 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Apr 2010 17:04:06 -0000	1.15
+++ sources	28 Apr 2010 00:40:37 -0000	1.16
@@ -1 +1 @@
-3e4a55f370805cda9ac415211da4aacc  libgda-4.0.8.tar.bz2
+d092638c28711fb9577f8cc6ac65fd53  libgda-4.1.4.tar.bz2



More information about the scm-commits mailing list