X-Git-Url: http://git.pld-linux.org/?p=packages%2Fglom.git;a=blobdiff_plain;f=glom.spec;h=6612e8fea4b6fcc58953d42acddf6dd7a1c9a330;hp=7575c01267edd1ee64106efce8614ef0b0227ea0;hb=dac56f7;hpb=8dece2c81ee666cecbef1c88c0a9401aa3095188

diff --git a/glom.spec b/glom.spec
index 7575c01..6612e8f 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,40 +1,41 @@
 Summary:	A user-friendly database environment
 Summary(pl.UTF-8):	Przyjazne użytkownikowi środowisko bazodanowe
 Name:		glom
-Version:	1.24.3
-Release:	2
+Version:	1.30.4
+Release:	9
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glom/1.24/%{name}-%{version}.tar.xz
-# Source0-md5:	4221d5dc3b66b6541e9713d774e47848
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glom/1.30/%{name}-%{version}.tar.xz
+# Source0-md5:	6f4d3b906e6563798c199517e78edaf7
 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.46.1
 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:	goocanvasmm2-devel >= 1.90.11
+BuildRequires:	gtkmm3-devel >= 3.18.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.0.3
-BuildRequires:	libgdamm5-devel >= 4.99.6
+BuildRequires:	libgda5-devel >= 5.2.1
+BuildRequires:	libgdamm5-devel >= 4.99.10
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.2.0
-BuildRequires:	libxml++-devel >= 2.23.1
+BuildRequires:	libxml++2-devel >= 2.24.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
@@ -43,25 +44,24 @@ 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.46.1
 Requires:	goocanvas2 >= 2.0.1
-Requires:	goocanvasmm2 >= 1.90.8
-Requires:	gtkmm3 >= 3.4.0
-Requires:	gtksourceviewmm3 >= 3.0.0
+Requires:	goocanvasmm2 >= 1.90.11
+Requires:	gtkmm3 >= 3.18.0
+Requires:	gtksourceviewmm3 >= 3.18.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:	libgda5 >= 5.2.1
+Requires:	libgdamm5 >= 4.99.10
+Requires:	libxml++2 >= 2.24.0
 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
+Requires:	python3-modules >= 1:3.2
+Requires:	python3-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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -87,6 +87,9 @@ 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
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API documentation for Glom library and its Python binding.
@@ -109,7 +112,6 @@ Przykłady dla Gloma.
 %setup -q
 
 %build
-%{__gnome_doc_prepare}
 %{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -118,10 +120,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}
 
@@ -132,9 +137,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
 
-%find_lang %{name} --with-gnome --with-omf
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+cp -pr examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,14 +152,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)
@@ -161,29 +167,29 @@ 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.24.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglom-1.24.so.0
-%attr(755,root,root) %{py_sitedir}/glom_1_24.so
+%attr(755,root,root) %{_libdir}/libglom-1.30.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglom-1.30.so.0
+%attr(755,root,root) %{py3_sitedir}/glom_1_30.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.24.so
-%{_includedir}/glom-1.24
-%{_pkgconfigdir}/glom-1.24.pc
+%attr(755,root,root) %{_libdir}/libglom-1.30.so
+%{_includedir}/glom-1.30
+%{_pkgconfigdir}/glom-1.30.pc
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_docdir}/libglom-1.24
-%{_docdir}/pyglom_1_24
-%{_datadir}/devhelp/books/libglom-1.24
+%{_docdir}/libglom-1.30
+%{_docdir}/pyglom_1_30
+%{_datadir}/devhelp/books/libglom-1.30
 
 %files examples
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glom_create_from_example
-%dir %{_docdir}/glom
-%{_docdir}/glom/examples
+%{_examplesdir}/%{name}-%{version}