- python 3.5 is required now

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 451704972d0d1994c287832906174b9fa6442255..4db8ccdf6751ff8c612f1ada4c86ed8e0f2d857b 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -5,7 +5,6 @@
 %bcond_without selinux         # SELinux support in gio
 %bcond_without systemtap       # systemtap/dtrace probes
 
-%include       /usr/lib/rpm/macros.perl
 Summary:       Useful routines for 'C' programming
 Summary(cs.UTF-8):     Šikovná knihovna s funkcemi pro pomocné programy
 Summary(da.UTF-8):     Nyttige biblioteksfunktioner
@@ -19,14 +18,15 @@ Summary(pt_BR.UTF-8):       Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):     Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
-Version:       2.60.1
+Version:       2.64.1
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.60/glib-%{version}.tar.xz
-# Source0-md5: 3b6046a33102397330cbc63847093a39
-URL:           http://www.gtk.org/
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.64/glib-%{version}.tar.xz
+# Source0-md5: 8dec46be3e4fa349b733ef6d4fbeaa3e
+Patch0:                %{name}-python_shebang.patch
+URL:           https://www.gtk.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl-nons
@@ -38,23 +38,22 @@ BuildRequires:      glibc-localedb-all
 %endif
 %if %{with apidocs}
 BuildRequires: gtk-doc >= 1.20
-BuildRequires: gtk-doc-automake >= 1.20
 %endif
 BuildRequires: libffi-devel >= 3.0.0
 BuildRequires: libmount-devel >= 2.28
 %{?with_selinux:BuildRequires: libselinux-devel}
-BuildRequires: meson >= 0.48.0
-BuildRequires: ninja
+BuildRequires: meson >= 0.49.2
+BuildRequires: ninja >= 1.5
 BuildRequires: pcre-devel >= 8.31
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.16
 # in case of separate libelf (elfutils don't provide .pc file)
 #BuildRequires:        pkgconfig(libelf) >= 0.8.12
 BuildRequires: pkgconfig(libffi) >= 3.0.0
-BuildRequires: python3 >= 1:3.4
+BuildRequires: python3 >= 1:3.5
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: rpmbuild(macros) >= 1.745
 BuildRequires: sed >= 4.0
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: tar >= 1:1.22
@@ -66,8 +65,6 @@ Requires:     pcre >= 8.31
 Suggests:      gvfs
 Provides:      glib2-libs
 Obsoletes:     glib2-libs
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 # see https://bugzilla.xfce.org/show_bug.cgi?id=9709
 Conflicts:     xfce4-session < 4.10.0-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,7 +126,7 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 Requires:      libffi-devel >= 3.0.0
 Requires:      libmount-devel >= 2.28
 Requires:      pcre-devel >= 8.31
-Requires:      python3-modules
+Requires:      python3-modules >= 1:3.5
 # gio only
 %{?with_selinux:Requires:      libselinux-devel}
 Requires:      zlib-devel
@@ -235,6 +232,7 @@ Sondy systemtap/dtrace dla GLib 2.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1
 
 %build
 %meson build \
@@ -264,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
 %py_postclean $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
 
+# adjust for compatibility with names supported by glibc
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
+
 %find_lang glib20
 
 %clean
@@ -283,7 +284,6 @@ umask 022
 %attr(755,root,root) %{_bindir}/gapplication
 %attr(755,root,root) %{_bindir}/gdbus
 %attr(755,root,root) %{_bindir}/gio
-%attr(755,root,root) %{_bindir}/gio-launch-desktop
 %attr(755,root,root) %{_bindir}/gio-querymodules
 %attr(755,root,root) %{_bindir}/glib-compile-schemas
 %attr(755,root,root) %{_bindir}/gsettings