X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glom.spec;h=97788539789e6aa27e3ec63da5d5792d9a2d9062;hb=HEAD;hp=3c6bd4bf315aad37224d9225e61b5b55a0c0d24d;hpb=4ab1b7770a65a30c57c37971eafc63ac307ff4df;p=packages%2Fglom.git

diff --git a/glom.spec b/glom.spec
index 3c6bd4b..9778853 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,41 +1,44 @@
 Summary:	A user-friendly database environment
 Summary(pl.UTF-8):	Przyjazne użytkownikowi środowisko bazodanowe
 Name:		glom
-Version:	1.26.0
-Release:	1
+Version:	1.32.0
+Release:	11
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glom/1.26/%{name}-%{version}.tar.xz
-# Source0-md5:	7e1d9fe660437e19134f52de0d2af5b4
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glom/1.32/%{name}-%{version}.tar.xz
+# Source0-md5:	194d2dec2254f48c49f518935302992f
+Patch0:		%{name}-build.patch
+Patch1:		%{name}-pc.patch
 URL:		http://www.glom.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	boost-devel
+BuildRequires:	boost-python3-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:	gettext-tools >= 0.17
+BuildRequires:	glibmm-devel >= 2.47.4
 BuildRequires:	goocanvas2-devel >= 2.0.1
-BuildRequires:	goocanvasmm2-devel >= 1.90.8
-BuildRequires:	gtkmm3-devel >= 3.10.0
-BuildRequires:	gtksourceviewmm3-devel >= 3.0.0
+BuildRequires:	goocanvasmm2-devel >= 1.90.11
+BuildRequires:	gtkmm3-devel >= 3.22.0
+BuildRequires:	gtksourceviewmm3-devel >= 3.18.0
 BuildRequires:	intltool >= 0.36.0
 BuildRequires:	iso-codes
 BuildRequires:	libarchive-devel >= 3.0
 BuildRequires:	libepc-devel >= 0.4.0
-BuildRequires:	libgda5-devel >= 5.2.1
-BuildRequires:	libgdamm5-devel >= 4.99.6
-BuildRequires:	libstdc++-devel
+BuildRequires:	libgda5-devel >= 5.2.9
+BuildRequires:	libgdamm5-devel >= 4.99.10
+BuildRequires:	libsigc++-devel >= 2.9.2
+BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	libtool >= 2:2.2.0
-BuildRequires:	libxml++-devel >= 2.23.1
+BuildRequires:	libxml++-devel >= 3.0.0
 BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	mm-common >= 0.9.5
 BuildRequires:	pkgconfig
 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:	python3-devel >= 1:3.2
+BuildRequires:	python3-pygobject3-devel >= 2.29.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	sphinx-pdg
@@ -44,25 +47,25 @@ 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
-%pyrequires_eq	python-modules
 Requires:	evince >= 3.0
-Requires:	glibmm >= 2.32.0
+Requires:	glibmm >= 2.47.4
 Requires:	goocanvas2 >= 2.0.1
-Requires:	goocanvasmm2 >= 1.90.8
-Requires:	gtkmm3 >= 3.10.0
-Requires:	gtksourceviewmm3 >= 3.0.0
+Requires:	goocanvasmm2 >= 1.90.11
+Requires:	gtkmm3 >= 3.22.0
+Requires:	gtksourceviewmm3 >= 3.18.0
 Requires:	iso-codes
 Requires:	libepc >= 0.4.0
-Requires:	libgda5 >= 5.2.1
-Requires:	libgdamm5 >= 4.99.6
-Requires:	libxml++ >= 2.23.1
+Requires:	libgda5 >= 5.2.9
+Requires:	libgdamm5 >= 4.99.10
+Requires:	libsigc++ >= 2.9.2
+Requires:	libxml++ >= 3.0.0
 Requires:	libxslt >= 1.1.17
-Requires:	python-pygobject3 >= 2.29.0
-Suggests:	libgda5-provider-mysql >= 5.2.1
-Suggests:	libgda5-provider-postgres >= 5.2.1
-Suggests:	libgda5-provider-sqlite >= 5.2.1
+Requires:	python3-modules >= 1:3.2
+Requires:	python3-pygobject3 >= 2.29.0
+Suggests:	libgda5-provider-mysql >= 5.2.9
+Suggests:	libgda5-provider-postgres >= 5.2.9
+Suggests:	libgda5-provider-sqlite >= 5.2.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,6 +80,11 @@ Summary:	Header files for Glom library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Glom
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	glibmm-devel >= 2.47.4
+Requires:	libgdamm5-devel >= 4.99.10
+Requires:	libstdc++-devel >= 6:5
+Requires:	libxml++-devel >= 3.0.0
+Requires:	libxslt-devel >= 1.1.17
 
 %description devel
 Header files for Glom library.
@@ -88,6 +96,7 @@ Pliki nagłówkowe biblioteki Glom.
 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
+BuildArch:	noarch
 
 %description apidocs
 API documentation for Glom library and its Python binding.
@@ -108,9 +117,10 @@ Przykłady dla Gloma.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{__gnome_doc_prepare}
 %{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -119,10 +129,13 @@ Przykłady dla Gloma.
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-scrollkeeper \
+	PYTHON="%{__python3}" \
 	--disable-silent-rules \
 	--disable-static \
 	--disable-update-mime-database \
+	--enable-mysql \
+	--enable-sqlite \
+	--with-mysql-utils=%{_bindir} \
 	--with-postgres-utils=%{_bindir}
 %{__make}
 
@@ -133,12 +146,12 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/*.la
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 cp -pr examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,14 +161,12 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -165,26 +176,27 @@ rm -rf $RPM_BUILD_ROOT
 %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.26.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglom-1.26.so.0
-%attr(755,root,root) %{py_sitedir}/glom_1_26.so
+%attr(755,root,root) %{_libdir}/libglom-1.32.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglom-1.32.so.0
+%attr(755,root,root) %{py3_sitedir}/glom_1_32.so
 %{_datadir}/%{name}
 %{_datadir}/appdata/glom.appdata.xml
 %{_datadir}/mime/packages/glom.xml
 %{_desktopdir}/glom.desktop
-%{_iconsdir}/hicolor/*/apps/glom.*
+%{_iconsdir}/hicolor/*x*/apps/glom.png
+%{_iconsdir}/hicolor/scalable/apps/glom.svg
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libglom-1.26.so
-%{_includedir}/glom-1.26
-%{_pkgconfigdir}/glom-1.26.pc
+%attr(755,root,root) %{_libdir}/libglom-1.32.so
+%{_includedir}/glom-1.32
+%{_pkgconfigdir}/glom-1.32.pc
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_docdir}/libglom-1.26
-%{_docdir}/pyglom_1_26
-%{_datadir}/devhelp/books/libglom-1.26
+%{_docdir}/libglom-1.32
+%{_docdir}/pyglom_1_32
+%{_datadir}/devhelp/books/libglom-1.32
 
 %files examples
 %defattr(644,root,root,755)