- updated to 1.24.2

- removed obsolete patches

diff --git a/glom-desktop.patch b/glom-desktop.patch
deleted file mode 100644 (file)
index 549f382..0000000
--- a/glom-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN glom-1.8.5/glom.desktop.in.in glom-1.8.5.new/glom.desktop.in.in
---- glom-1.8.5/glom.desktop.in.in      2008-10-28 17:23:33.000000000 +0100
-+++ glom-1.8.5.new/glom.desktop.in.in  2009-02-11 11:17:19.000000000 +0100
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Glom
- _Comment=A user-friendly database environment.
- Exec=glom
- Terminal=false
- Type=Application
- Icon=glom
--Categories=Application;GNOME;Office;GTK;Database
-+Categories=GTK;GNOME;Office;Database;
- StartupNotify=true
- MimeType=application/x-glom;
- X-GNOME-DocPath=glom/index.html

diff --git a/glom-postgres-utils.patch b/glom-postgres-utils.patch
deleted file mode 100644 (file)
index 134bd43..0000000
--- a/glom-postgres-utils.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN glom-1.8.5/configure.in glom-1.8.5.new/configure.in
---- glom-1.8.5/configure.in    2009-01-04 17:59:33.000000000 +0100
-+++ glom-1.8.5.new/configure.in        2009-02-11 11:20:00.000000000 +0100
-@@ -151,14 +151,6 @@
- 
-       AC_SUBST(POSTGRES_UTILS_PATH)
-       AC_DEFINE_UNQUOTED([POSTGRES_UTILS_PATH], ["${POSTGRES_UTILS_PATH}"], [Path to the postgres utilities, such as postmaster.])
--
--      if test $enable_client_only != yes; then
--              # Check that the supplied (or default) path really contains the postgres utilities:
--              AC_CHECK_PROG(HAVE_POSTMASTER, postmaster, yes, no, ${POSTGRES_UTILS_PATH})
--              if test "x$HAVE_POSTMASTER" = "xno"; then
--              AC_MSG_ERROR([The postgres utilities could not be found in the path: ${POSTGRES_UTILS_PATH}. They are needed for self-hosting of Glom databases. Please make sure that Postgres is installed, and provide the correct path with the --with-postgres-utils option.])
--              fi
--      fi
- fi
- 
- 

diff --git a/glom.spec b/glom.spec
index c32b4b471838a5e464f42dec7d6fafcace2e164e..792e71269f90c39a301ccde30016306a75461794 100644 (file)
--- a/glom.spec
+++ b/glom.spec
@@ -1,43 +1,67 @@
 Summary:       A user-friendly database environment
 Summary(pl.UTF-8):     Przyjazne użytkownikowi środowisko bazodanowe
 Name:          glom
-Version:       1.8.6
-Release:       4
+Version:       1.24.2
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glom/1.8/%{name}-%{version}.tar.bz2
-# Source0-md5: 36599a6909e40afb5bcf4c414a70c49b
-Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-postgres-utils.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glom/1.24/%{name}-%{version}.tar.xz
+# Source0-md5: 27cdba1fb3b24ee9a7561980b889ca18
 URL:           http://www.glom.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: avahi-glib-devel
-BuildRequires: bakery-devel >= 2.6.0
-BuildRequires: gettext-devel
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.10
+BuildRequires: boost-devel
+BuildRequires: evince-devel >= 3.0
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: glibmm-devel >= 2.32.0
 BuildRequires: gnome-doc-utils >= 0.10.0
-BuildRequires: goocanvasmm-devel >= 0.13.0
-BuildRequires: gtkmm-devel >= 2.10.5
-BuildRequires: gtksourceviewmm2-devel
+BuildRequires: goocanvas2-devel >= 2.0.1
+BuildRequires: goocanvasmm2-devel >= 1.90.8
+BuildRequires: gtkmm3-devel >= 3.4.0
+BuildRequires: gtksourceviewmm3-devel >= 3.0.0
 BuildRequires: intltool >= 0.36.0
 BuildRequires: iso-codes
-BuildRequires: libepc-devel >= 0.3.1
-BuildRequires: libgdamm3-devel
-BuildRequires: libtool
+BuildRequires: libepc-devel >= 0.4.0
+BuildRequires: libgda5-devel >= 5.0.3
+BuildRequires: libgdamm5-devel >= 4.99.6
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2.2.0
+BuildRequires: libxml++-devel >= 2.23.1
 BuildRequires: libxslt-devel >= 1.1.17
+BuildRequires: mm-common >= 0.9.5
 BuildRequires: pkgconfig
-BuildRequires: python-gnome-extras-gda-devel >= 2.19.1
-BuildRequires: python-pygtk-devel >= 2:2.12.0
+BuildRequires: pkgconfig(libgda-mysql-5.0)
+BuildRequires: pkgconfig(libgda-postgres-5.0)
+BuildRequires: pkgconfig(libgda-sqlite-5.0)
+BuildRequires: python-devel
+BuildRequires: python-pygobject3-devel >= 2.29.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: sphinx-pdg
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
-Requires:      libgda3-provider-postgres
-Requires:      python-gnome-extras-gda >= 2.19.1
 %pyrequires_eq python-modules
+Requires:      evince >= 3.0
+Requires:      glibmm >= 2.32.0
+Requires:      goocanvas2 >= 2.0.1
+Requires:      goocanvasmm2 >= 1.90.8
+Requires:      gtkmm3 >= 3.4.0
+Requires:      gtksourceviewmm3 >= 3.0.0
+Requires:      iso-codes
+Requires:      libepc >= 0.4.0
+Requires:      libgda5 >= 5.0.3
+Requires:      libgdamm5 >= 4.99.6
+Requires:      libxml++ >= 2.23.1
+Requires:      libxslt >= 1.1.17
+Requires:      python-pygobject3 >= 2.29.0
+Suggests:      libgda5-provider-mysql >= 5.0.3
+Suggests:      libgda5-provider-postgres >= 5.0.3
+Suggests:      libgda5-provider-sqlite >= 5.0.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,14 +71,46 @@ Glom is an easy-to-use database designer and user interface.
 Glom jest łatwym w użyciu programem do projektowania baz danych oraz
 interfejsem użytkownika.
 
+%package devel
+Summary:       Header files for Glom library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Glom
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Header files for Glom library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Glom.
+
+%package apidocs
+Summary:       API documentation for Glom library and its Python binding
+Summary(pl.UTF-8):     Dokumentacja API biblioteki Glom i jej wiązań do Pythona
+Group:         Documentation
+
+%description apidocs
+API documentation for Glom library and its Python binding.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Glom i jej wiązań do Pythona.
+
+%package examples
+Summary:       Examples for Glom
+Summary(pl.UTF-8):     Przykłady dla Gloma
+Group:         Documentation
+
+%description examples
+Examples for Glom.
+
+%description examples -l pl.UTF-8
+Przykłady dla Gloma.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}
-%{__glib_gettextize}
+%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I macros
@@ -62,9 +118,10 @@ interfejsem użytkownika.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-scrollkeeper \
+       --disable-silent-rules \
        --disable-static \
        --disable-update-mime-database \
-       --disable-scrollkeeper \
        --with-postgres-utils=%{_bindir}
 %{__make}
 
@@ -74,9 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -101,10 +157,33 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/glom
-%attr(755,root,root) %{_libdir}/libglom.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglom.so.0
-%attr(755,root,root) %{py_sitedir}/glom.so
+%attr(755,root,root) %{_bindir}/glom_export_po
+%attr(755,root,root) %{_bindir}/glom_export_po_all
+%attr(755,root,root) %{_bindir}/glom_import_po_all
+%attr(755,root,root) %{_bindir}/glom_test_connection
+%attr(755,root,root) %{_libdir}/libglom-1.24.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglom-1.24.so.0
+%attr(755,root,root) %{py_sitedir}/glom_1_24.so
 %{_datadir}/%{name}
+%{_datadir}/appdata/glom.appdata.xml
 %{_datadir}/mime/packages/glom.xml
 %{_desktopdir}/glom.desktop
-%{_iconsdir}/hicolor/*/apps/*
+%{_iconsdir}/hicolor/*/apps/glom.*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libglom-1.24.so
+%{_includedir}/glom-1.24
+%{_pkgconfigdir}/glom-1.24.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_docdir}/libglom-1.24
+%{_docdir}/pyglom_1_24
+%{_datadir}/devhelp/books/libglom-1.24
+
+%files examples
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/glom_create_from_example
+%dir %{_docdir}/glom
+%{_docdir}/glom/examples