[libgda] upstream 5.1.1

Haïkel Guémar hguemar at fedoraproject.org
Sun Oct 21 19:19:35 UTC 2012


commit b3c58d318b2ddbda2324444a9d5200c388ce1efc
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sun Oct 21 21:19:20 2012 +0200

    upstream 5.1.1

 .gitignore                      |    1 +
 libgda-3.0.0-man.patch          |  121 --------
 libgda-3.99.8-lib64.patch       |   15 -
 libgda-4.2.11-dso-linking.patch |   21 --
 libgda-4.2.12-jre17.patch       |   47 ---
 libgda-4.2.4-sqlite3.patch      |   27 --
 libgda.spec                     |  597 +++++++++++++++------------------------
 sources                         |    2 +-
 8 files changed, 225 insertions(+), 606 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f4ed74..6052ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libgda-4.1.6.tar.bz2
 /libgda-4.2.11.tar.bz2
 /libgda-4.2.12.tar.xz
 /libgda-4.2.13.tar.xz
+/libgda-5.1.1.tar.xz
diff --git a/libgda.spec b/libgda.spec
index 0eccc77..69cdf33 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -1,489 +1,338 @@
-# Default provider build options (MySQL, Postgres, unixODBC, LDAP, FreeTDS)
-#
-# Package build options:
-# --without mdb
-# --without mysql
-# --without postgres
-# --without java
-#
-
-%define           MDB      1
-%define           MYSQL    1
-%define           POSTGRES 1
-%define           JAVA     1
-
-%{?_without_mdb:%define MDB     0}
-%{?_without_mysql:%define MYSQL 0}
-%{?_without_postgres:%define POSTGRES 0}
-%{?_with_java:%define JAVA 1}
-
-Name:             libgda
-Epoch:            1
-Version:          4.2.13
-Release:          1%{?dist}
-Summary:          Library for writing gnome database programs
-Group:            System Environment/Libraries
-License:          LGPLv2+
-URL:              http://www.gnome-db.org/
-Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.2/%{name}-%{version}.tar.xz
-Patch1:           libgda-3.0.0-man.patch
-Patch2:           libgda-3.99.8-lib64.patch
-Patch3:           libgda-4.2.4-sqlite3.patch
-Patch4:           libgda-4.2.11-dso-linking.patch
-Patch5:           libgda-4.2.12-jre17.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%bcond_without bdb
+%bcond_without ldap
+%bcond_without mysql
+%bcond_without postgres
+%bcond_without mdb
+%bcond_without java
+
+%global apiver  5.0
+
+Name:           libgda
+Version:        5.1.1
+Release:        1%{?dist}
+Summary:        Library for writing gnome database programs
+
+License:        LGPLv2+
+URL:            http://www.gnome-db.org/
+Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/5.0/%{name}-%{version}.tar.xz
+
 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:    glib2-devel >= 2.28.0
+BuildRequires:    gtk3-devel >= 3.0.0
+BuildRequires:    gtksourceview3-devel
+BuildRequires:    goocanvas2-devel
 BuildRequires:    graphviz-devel >= 2.26.0
 BuildRequires:    iso-codes >= 3.15
 BuildRequires:    libxslt-devel >= 1.0.9
-BuildRequires:    sqlite-devel >= 3.6.0
-BuildRequires:    libtool
+BuildRequires:    sqlite-devel >= 3.6.11
+BuildRequires:    libgcrypt-devel
 BuildRequires:    gobject-introspection-devel >= 0.6.5
-BuildRequires:    libxml2-devel readline-devel libdb-devel json-glib-devel
+BuildRequires:    libxml2-devel readline-devel json-glib-devel
 BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser)
 BuildRequires:    libsoup-devel
-BuildRequires:    java-1.7.0-openjdk >= 1.7.0.0
 BuildRequires:    gnome-doc-utils
-BuildRequires:    libdb-devel
-BuildRequires:    openldap-devel
-
-%if %{MYSQL}
-BuildRequires:    mysql-devel
-%endif
-
-%if %{POSTGRES}
-BuildRequires:    postgresql-devel
-%endif
-
-%if %{MDB}
-BuildRequires:    mdbtools-devel
-%endif
-
-%if %{JAVA}
-BuildRequires:    java-1.7.0-openjdk-devel
-%endif
+BuildRequires:    openssl-devel
+BuildRequires:    libgnome-keyring-devel
+%{!?_without_bdb:BuildRequires:    libdb-devel, libdb-sql-devel}
+%{!?_without_ldap:BuildRequires:    openldap-devel}
+%{!?_without_mysql:BuildRequires:    mysql-devel}
+%{!?_without_postgres:BuildRequires:    postgresql-devel}
+%{!?_without_mdb:BuildRequires:    mdbtools-devel}
+%{!?_without_java:BuildRequires:    java-devel >= 1:1.6.0}
 
 %description
-libgda is a library that eases the task of writing
-gnome database programs.
-
+%{name} is a library that eases the task of writing Gtk3-based database
+programs.
 
-%package devel
-Summary:          Development libraries and header files for libgda
-Group:            Development/Libraries
-Requires:         glib2-devel >= 2.0.0
-Requires:         libxslt-devel >= 1.0.9
-Requires:         libdb-devel libxml2-devel pkgconfig
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description devel
-This package contains the header files and libraries needed to write
-or compile programs that use libgda.
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %package ui
-Summary:          Libgda UI extensions
-Group:            Development/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+Summary:         UI extensions for %{name}
+Group:           Development/Libraries
+Requires:        %{name}%{?_isa} = %{version}-%{release}
 
 %description ui
-libgda-ui extends libgda providing graphical widgets (Gtk+).
+%{name}-ui extends %{name} 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
+%package        ui-devel
+Summary:        Development files for %{name}-ui
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-ui%{?_isa} = %{version}-%{release}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:       gtk3-devel%{?_isa} >= 3.0.0
 
-%description ui-devel
-This package contains the header files and libraries needed to write
-or compile programs that use libgda-ui.
+%description    ui-devel
+The %{name}-ui-devel package contains libraries and header files for
+developing applications that use %{name}-ui.
 
 %package tools
-Summary:          Graphical tools for libgda
-Group:            Applications/Databases
-Requires:         %{name}-ui = %{epoch}:%{version}-%{release}
+Summary:         Graphical tools for %{name}
+Group:           Applications/Databases
+Requires:        %{name}-ui%{?_isa} = %{version}-%{release}
 
 %description tools
-This package provides libgda graphical tools.
+This %{name}-tools package provides graphical tools for %{name}.
 
 %package sqlite
-Summary:          SQLite provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
-Requires:         sqlite%{?_isa} >= 3.6.O
+Summary:        SQLite provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
+Requires:       sqlite%{?isa} >= 3.6.11
+
 %description sqlite
-This package includes the libgda SQLite provider.
+This %{name}-sqlite includes the %{name} SQLite provider.
 
-%package sqlite-devel
-Summary:          SQLite provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         pkgconfig
-Requires:         %{name}-sqlite = %{epoch}:%{version}-%{release}
-%description sqlite-devel
-This package includes the pkgconfig file for the libgda SQLite provider.
+%if 0%{with_bdb}
+%package bdb
+Summary:        Berkeley DB provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
 
+%description bdb
+This %{name}-bdb includes the %{name} Berkeley DB provider.
+%endif
+
+%if 0%{with_ldap}
 %package ldap
-Summary:          ldap provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
-%description ldap
-This package includes the GDA ldap provider.
+Summary:        Ldap provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
 
-%package ldap-devel
-Summary:          ldap provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         %{name}-ldap = %{epoch}:%{version}-%{release}, pkgconfig
-%description ldap-devel
-This package includes the pkgconfig file for the libgda ldap provider.
+%description ldap
+This %{name}-ldap includes the %{name} Ldap provider.
+%endif
 
 %package sqlcipher
-Summary:          SQLite provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
-%description sqlcipher
-This package includes the libgda SQLCipher provider.
-
-%package sqlcipher-devel
-Summary:          SQLite provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         pkgconfig
-Requires:         %{name}-sqlite = %{epoch}:%{version}-%{release}
-%description sqlcipher-devel
-This package includes the pkgconfig file for the libgda SQLCipher provider.
+Summary:        SQLiteCipher provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
 
+%description sqlcipher
+This %{name}-sqlcipher includes the %{name} SQLiteCipher 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.
+Summary:        Web provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
 
-%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.
+%description web
+This %{name}-web includes the %{name} Web provider.
 
-%if %{MYSQL}
+%if 0%{with_mysql}
 %package mysql
-Summary:          MySQL provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+Summary:        Mysql provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
+
 %description mysql
-This package includes the libgda MySQL provider.
-
-%package mysql-devel
-Summary:          MySQL provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         pkgconfig
-Requires:         %{name}-mysql = %{epoch}:%{version}-%{release}
-%description mysql-devel
-This package includes the pkgconfig file for the libgda MySQL provider.
+This %{name}-mysql includes the %{name} Mysql provider.
 %endif
 
-%if %{POSTGRES}
+%if 0%{with_postgres}
 %package postgres
-Summary:          PostgreSQL provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+Summary:        Postgres provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
+
 %description postgres
-This package includes the libgda PostgreSQL provider.
-
-%package postgres-devel
-Summary:          PostgreSQL provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         pkgconfig
-%description postgres-devel
-This package includes the pkgconfig file for the libgda PostgreSQL provider.
+This %{name}-postgres includes the %{name} PostgreSQL provider.
 %endif
 
-%if %{MDB}
+%if 0%{with_mdb}
 %package mdb
-Summary:          MDB provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+Summary:        Mdb provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
+
 %description mdb
-This package includes the libgda MDB provider.
-
-%package mdb-devel
-Summary:          MDB provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         pkgconfig
-Requires:         %{name}-mdb = %{epoch}:%{version}-%{release}
-%description mdb-devel
-This package includes the pkgconfig file for the libgda MDB provider.
+This %{name}-mdb includes the %{name} Mdb provider.
 %endif
 
-%if %{JAVA}
+%if 0%{with_java}
 %package java
-Summary:          Java JDBC provider for libgda
-Group:            System Environment/Libraries
-Requires:         %{name} = %{epoch}:%{version}-%{release}
+Summary:        Java provider for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}%{?isa} = %{version}-%{release}
+
 %description java
-This package includes the GDA Java JDBC provider.
-
-%package java-devel
-Summary:          Java JDBC provider for libgda pkgconfig file
-Group:            Development/Libraries
-Requires:         %{name}-java = %{epoch}:%{version}-%{release}, pkgconfig
-%description java-devel
-This package includes the pkgconfig file for the libgda Java JDBC provider.
+This %{name}-java includes the %{name} Java JDBC provider.
 %endif
 
 
 %prep
 %setup -q
-# fix encoding of AUTHORS
+# AUTHORS not in UTF-8
 iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \
-touch -r AUTHORS AUTHORS.new && \
-mv AUTHORS.new AUTHORS
-%patch1 -p1 -b .man
-%patch2 -p1 -b .lib64
-%patch3 -p1 -b .sqlite3
-%patch4 -p1 -b .dso
-%patch5 -p1 -b .jre17
-# recompile getsp.class with the jre17 patch
-javac getsp.java
-# need to reconfigure autotools scripts against newer toolchain
-autoreconf -fi
-
+touch -r AUTHORS AUTHORS.new && mv AUTHORS.new AUTHORS
 
 %build
-CONFIG="--disable-static --disable-dependency-tracking --enable-system-sqlite --with-libsoup \
---enable-gtk-doc --enable-introspection=yes \
---with-bdb=%{_prefix} --with-bdb-libdir-name=%{_lib}"
-
-%if %{MYSQL}
-CONFIG="$CONFIG --with-mysql"
-%else
-CONFIG="$CONFIG --without-mysql"
+# set LD_LIBRARY_PATH manually since it fails to find libjvm with_java7
+%if 0%{?with_java}
+%ifarch x86_64
+%global archinstall amd64
 %endif
-
-%if %{POSTGRES}
-CONFIG="$CONFIG --with-postgres"
-%else
-CONFIG="$CONFIG --without-postgres"
+%ifarch %{ix86}
+%global archinstall i386
 %endif
-
-%if %{MDB}
-CONFIG="$CONFIG --with-mdb"
-%else
-CONFIG="$CONFIG --without-mdb"
-%endif
-
-%if %{JAVA}
-CONFIG="$CONFIG --with-java"
-%else
-CONFIG="$CONFIG --without-java"
+export LD_LIBRARY_PATH=/usr/lib/jvm/java/jre/lib/%{archinstall}/server:$LD_LIBRARY_PATH
 %endif
-
-%configure $CONFIG
-export LD_LIBRARY_PATH=`pwd`/libgda/.libs:`pwd`/libgda-report/.libs:`pwd`/libgda-ui/.libs:$LD_LIBRARY_PATH
+# vala support has not been tested yet so it is not enabled yet
+# G-I-R is disabled since it's broken
+%configure --disable-static --enable-vala=no \
+           --with-libsoup  --with-gnome-keyring \
+           --with-ui --with-gtksourceview \
+           --with-goocanvas --with-graphviz \
+           --enable-system-sqlite=yes \
+           %{?with_bdb:--with-bdb=yes --with-bdb-libdir-name=%{_lib}} \
+           %{!?with_ldap:--with-ldap=no} \
+           %{!?with_mysql:--with-mysql=no} \
+           %{!?with_postgres:--with-postgresql=no} \
+           %{!?with_mdb:--with-mdb=no} \
+           %{!?with_java:--with-java=no}
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-# libgda/libgda.h is not installed ?
-mv %{name}/%{name}.h %{buildroot}/%{_includedir}/%{name}-4.0/%{name}/%{name}.h
-# Cleanup unnecessary, unpackaged files
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-rm %{buildroot}/%{_sysconfdir}/libgda-4.0/sales_test.db
-
-%find_lang libgda-4.0
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+rm %{buildroot}/%{_sysconfdir}/%{name}-%{apiver}/sales_test.db
 
+%find_lang libgda-5.0
 
 %post -p /sbin/ldconfig
 %post ui -p /sbin/ldconfig
-
 %post devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+%post ui-devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
 
 %postun -p /sbin/ldconfig
 %postun ui -p /sbin/ldconfig
-
 %postun devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+%postun ui-devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
 
-%clean
-rm -rf %{buildroot}
-
-
-%files -f libgda-4.0.lang
-%defattr(-,root,root,-)
+%files -f libgda-5.0.lang
 %doc AUTHORS COPYING ChangeLog README NEWS
-%config(noreplace) %{_sysconfdir}/libgda-4.0
-%{_bindir}/gda-list-*-4.0
-%{_bindir}/gda-sql-4.0
-%{_bindir}/gda-test-connection-4.0
-%{_bindir}/gda-list-config
-%{_bindir}/gda-list-server-op
-%{_bindir}/gda-sql
-%{_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
-%{_datadir}/%{name}-4.0/gda_trml2html/
-%{_datadir}/%{name}-4.0/gda_trml2pdf/
-%{_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
+%config(noreplace) %{_sysconfdir}/%{name}-%{apiver}/config
+%{_libdir}/%{name}-%{apiver}.so.*
+%{_libdir}/%{name}-report-%{apiver}.so.*
+%{_libdir}/%{name}-xslt-%{apiver}.so.*
 %{_mandir}/man1/*
+%{_datadir}/%{name}-%{apiver}/dtd/libgda-*.dtd
+%{_datadir}/%{name}-%{apiver}/import_encodings.xml
+%{_datadir}/{%name}-%{apiver}/information_schema.xml
 
 %files devel
-%defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/libgda-4.0
-%{_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
+%doc %{_datadir}/gtk-doc/html/%{name}-%{apiver}
+%doc %{_datadir}/gnome/help/gda-sql/*
+%{_includedir}/%{name}-%{apiver}/%{name}
+%{_includedir}/%{name}-%{apiver}/%{name}-xslt
+%{_includedir}/%{name}-%{apiver}/%{name}-report
+%{_libdir}/%{name}-%{apiver}.so
+%{_libdir}/%{name}-report-%{apiver}.so
+%{_libdir}/%{name}-xslt-%{apiver}.so
+%{_libdir}/pkgconfig/%{name}-%{apiver}.pc
+%{_libdir}/pkgconfig/%{name}-*-%{apiver}.pc
+%exclude %{_libdir}/pkgconfig/%{name}-ui-%{apiver}.pc
 
 %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
+%doc
+%{_libdir}/%{name}-ui-%{apiver}.so.*
+%{_libdir}/%{name}-%{apiver}/plugins/*.xml
+%{_datadir}/%{name}-%{apiver}/pixmaps
+%{_datadir}/%{name}-%{apiver}/dtd/gdaui-layout.dtd
+%{_datadir}/%{name}-%{apiver}/ui/gdaui-entry-*.xml
+%{_datadir}/%{name}-%{apiver}/icons/hicolor/*
+%{_datadir}/%{name}-%{apiver}/server_operation.glade
+%{_datadir}/%{name}-%{apiver}/language-specs/gda-sql.lang
 
 %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
+%doc
+%{_includedir}/%{name}-%{apiver}/%{name}-ui
+%{_libdir}/%{name}-ui-%{apiver}.so
+%{_bindir}/gdaui-demo-%{apiver}
+%{_libdir}/pkgconfig/%{name}-ui-%{apiver}.pc
+%{_datadir}/%{name}-%{apiver}/demo/*.c
+%{_libdir}/%{name}-%{apiver}/plugins/%{name}-ui-plugins.so
+%{_datadir}/%{name}-%{apiver}/demo/custom_layout.xml
+%{_datadir}/%{name}-%{apiver}/demo/demo_db.db
 
 %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
+%doc %{_datadir}/gnome/help/gda-browser/*
+%doc %{_datadir}/gtk-doc/html/gda-browser/*
+%{_bindir}/gda-*
+%{_datadir}/%{name}-%{apiver}/gda_trml2html
+%{_datadir}/%{name}-%{apiver}/gda_trml2pdf
+%{_datadir}/applications/gda-browser-%{apiver}.desktop
+%{_datadir}/applications/gda-control-center-%{apiver}.desktop
+%{_datadir}/pixmaps/gda-browser-5.0.png
+%{_datadir}/icons/hicolor/*
 
 %files sqlite
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-4.0/providers/%{name}-sqlite.so
-%{_datadir}/%{name}-4.0/sqlite_specs*.xml
+%{_libdir}/%{name}-%{apiver}/providers/%{name}-sqlite.so
+%{_datadir}/%{name}-%{apiver}/sqlite_specs*.xml
 
-%files sqlite-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-sqlite-4.0.pc
+%if 0%{with_bdb}
+%files bdb
+%{_libdir}/libgda-%{apiver}/providers/libgda-bdb.so
+%{_datadir}/%{name}-%{apiver}/bdb_specs*.xml
+%endif
 
+%if 0%{with_ldap}
 %files ldap
-%defattr(-,root,root,-)
-%{_libdir}/%{name}-4.0/providers/%{name}-ldap.so
-%{_datadir}/%{name}-4.0/ldap_specs*.xml
-
-%files ldap-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-ldap-4.0.pc
+%{_libdir}/%{name}-%{apiver}/providers/%{name}-ldap.so
+%{_datadir}/%{name}-%{apiver}/ldap_specs*.xml
+%endif
 
 %files sqlcipher
-%defattr(-,root,root,-)
-%{_libdir}/%{name}-4.0/providers/%{name}-sqlcipher.so
-%{_datadir}/%{name}-4.0/sqlcipher_specs*.xml
-
-%files sqlcipher-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-sqlcipher-4.0.pc
+%{_libdir}/%{name}-%{apiver}/providers/%{name}-sqlcipher.so
+%{_datadir}/%{name}-%{apiver}/sqlcipher_specs*.xml
 
 %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
+%{_libdir}/%{name}-%{apiver}/providers/%{name}-web.so
+%{_datadir}/%{name}-%{apiver}/php/*
+%{_datadir}/%{name}-%{apiver}/web/*
+%{_datadir}/%{name}-%{apiver}/web_specs*.xml
 
-%if %{MYSQL}
+%if 0%{with_mysql}
 %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,-)
-%{_libdir}/pkgconfig/libgda-mysql-4.0.pc
+%{_libdir}/libgda-%{apiver}/providers/libgda-mysql.so
+%{_datadir}/%{name}-%{apiver}/mysql_specs*.xml
 %endif
 
-%if %{POSTGRES}
+%if 0%{with_postgres}
 %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,-)
-%{_libdir}/pkgconfig/libgda-postgres-4.0.pc
+%{_libdir}/libgda-%{apiver}/providers/libgda-postgres.so
+%{_datadir}/%{name}-%{apiver}/postgres_specs*.xml
 %endif
 
-%if %{MDB}
+%if 0%{with_mdb}
 %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,-)
-%{_libdir}/pkgconfig/libgda-mdb-4.0.pc
+%{_libdir}/libgda-%{apiver}/providers/libgda-mdb.so
+%{_datadir}/%{name}-%{apiver}/mdb_specs*.xml
 %endif
 
-%if %{JAVA}
+%if 0%{with_java}
 %files java
-%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,-)
-%{_libdir}/pkgconfig/libgda-jdbc-4.0.pc
+%{_libdir}/libgda-%{apiver}/providers/%{name}-jdbc.so
+%{_libdir}/libgda-%{apiver}/providers/gdaprovider-%{apiver}.jar
+%{_datadir}/%{name}-%{apiver}/jdbc_specs*.xml
 %endif
 
-
 %changelog
+* Sun Oct 21 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 5.1.1-1
+- upstream 5.1.1 based on libgda5 review (RHBZ #788569)
+
 * Sun Aug  5 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.13-1
 - upstream 4.2.13
 - bug fixes to MySQL and MDB providers and various minor issues
diff --git a/sources b/sources
index e124613..8163ebb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9a69fd4c08469c072c588ae9e73800b  libgda-4.2.13.tar.xz
+92a6536418f62b86818f489c2a2dfa94  libgda-5.1.1.tar.xz


More information about the scm-commits mailing list