- updated to 1.6.13

- added -postgres-utils.patch
- removed -python25-64bit.patch

Changed files:
    glom.spec -> 1.15

diff --git a/glom.spec b/glom.spec
index d66ada425e4532e949525e09f0681bcb1b527c7a..b98cd2df5c6a51013d2fee69b05bebe3259cd45f 100644 (file)
--- a/glom.spec
+++ b/glom.spec
@@ -1,40 +1,44 @@
 Summary:       A user-friendly database environment
 Summary(pl.UTF-8):     Przyjazne użytkownikowi środowisko bazodanowe
 Name:          glom
-Version:       1.6.12
-Release:       0.1
+Version:       1.6.13
+Release:       1
 License:       GPL v2
-Group:         Applications
+Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/glom/1.6/%{name}-%{version}.tar.bz2
 # Source0-md5: 23cfd65994a7a257de148c9ee0cd1f31
 Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-python25-64bit.patch
+Patch1:                %{name}-postgres-utils.patch
 URL:           http://www.glom.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bakery-devel >= 2.4.0
-BuildRequires: gnome-doc-utils >= 0.8.0
+BuildRequires: avahi-glib-devel
+BuildRequires: bakery-devel >= 2.4.3-2
+BuildRequires: gettext-devel
+BuildRequires: gnome-doc-utils >= 0.10.0
 BuildRequires: gnome-vfsmm-devel >= 2.16.0
-BuildRequires: gtkmm-devel >= 2.10.5
-BuildRequires: gtksourceview-devel >= 1.0
 BuildRequires: goocanvas-devel
-BuildRequires: intltool
+BuildRequires: gtkmm-devel >= 2.10.5
+BuildRequires: intltool >= 0.36.0
 BuildRequires: iso-codes
 BuildRequires: libgdamm3-devel
 BuildRequires: libgnome-devel >= 2.16.0
-BuildRequires: libgnomecanvasmm-devel >= 2.16.0
-BuildRequires: libgtksourceviewmm2-devel
+BuildRequires: libgtksourceviewmm-devel
 BuildRequires: libtool
 BuildRequires: libxslt-devel >= 1.1.17
-BuildRequires: postgresql-devel
-BuildRequires: python-gnome-extras-gda-devel >= 2.14.2-4
-BuildRequires: python-pygtk-devel >= 2:2.10.3
+BuildRequires: pkgconfig
+BuildRequires: python-gnome-extras-gda-devel >= 2.19.1
+BuildRequires: python-pygtk-devel >= 2:2.12.0
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
 Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
-Requires:      python-gnome-extras-gda >= 2.14.2-4
+Requires:      libgda3-provider-postgres
+Requires:      python-gnome-extras-gda >= 2.19.1
 %pyrequires_eq python-modules
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,7 +52,7 @@ interfejsem użytkownika.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -56,8 +60,8 @@ interfejsem użytkownika.
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I macros
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --disable-static \
@@ -76,19 +80,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
+%update_desktop_database_post
 %update_mime_database
 %update_icon_cache hicolor
 %scrollkeeper_update_post
 
 %postun
 /sbin/ldconfig
+%update_desktop_database_postun
 %update_mime_database
 %update_icon_cache hicolor
 %scrollkeeper_update_postun
@@ -96,16 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libglom.so*
+%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
 %{_datadir}/%{name}
-%{_datadir}/mime/packages/*.xml
-%{_desktopdir}/*.desktop
+%{_datadir}/mime/packages/glom.xml
+%{_desktopdir}/glom.desktop
 %{_iconsdir}/hicolor/*/apps/*
-%dir %{_omf_dest_dir}/%{name}
-%{_omf_dest_dir}/%{name}/glom-C.omf
-%lang(de) %{_omf_dest_dir}/%{name}/glom-de.omf
-%lang(en_GB) %{_omf_dest_dir}/%{name}/glom-en_GB.omf
-%lang(sv) %{_omf_dest_dir}/%{name}/glom-sv.omf
-%lang(es) %{_omf_dest_dir}/%{name}/glom-es.omf