X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glib2.spec;h=b1fa9c69ee5ccd31b4a41384ff3aa7cb51d19ebc;hb=4b9ecbf;hp=939df078e1253edd8338fd8a87d924e9721a238d;hpb=1344eef0a0842ba8ba4d7df623fd81dad4318270;p=packages%2Fglib2.git

diff --git a/glib2.spec b/glib2.spec
index 939df07..b1fa9c6 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,11 +1,11 @@
 #
 # Conditional build:
-%bcond_without	apidocs		# disable gtk-doc
+%bcond_without	apidocs		# gtk-doc based API documentation
 %bcond_without	static_libs	# static library
 %bcond_without	selinux		# SELinux support in gio
 %bcond_without	systemtap	# systemtap/dtrace probes
+%bcond_without	fam		# FAM filesystem monitoring support
 
-%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,44 +19,45 @@ 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.56.2
-Release:	2
+Version:	2.68.2
+Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.56/glib-%{version}.tar.xz
-# Source0-md5:	568b6b872d088ac9593b7a8d740812b4
-Patch0:		%{name}-makefile.patch
-URL:		http://www.gtk.org/
-BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.11
+Source0:	https://download.gnome.org/sources/glib/2.68/glib-%{version}.tar.xz
+# Source0-md5:	8d288416da38476c71998e5c2d3602ed
+Patch0:		%{name}-python_shebang.patch
+URL:		https://www.gtk.org/
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	elfutils-devel
-BuildRequires:	fam-devel
+%{?with_fam:BuildRequires:	fam-devel}
 BuildRequires:	gettext-tools
-%if %(locale -a | grep -q '^C-UTF\.8$'; echo $?)
+%if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
 %if %{with apidocs}
-BuildRequires:	gtk-doc >= 1.20
-BuildRequires:	gtk-doc-automake >= 1.20
+BuildRequires:	gtk-doc >= 1.32.1
+BuildRequires:	meson >= 0.52.0
 %endif
 BuildRequires:	libffi-devel >= 3.0.0
 BuildRequires:	libmount-devel >= 2.28
-%{?with_selinux:BuildRequires:	libselinux-devel}
-BuildRequires:	libtool >= 2:2.2
-BuildRequires:	pcre-devel >= 8.13
+%{?with_selinux:BuildRequires:	libselinux-devel >= 2.2}
+BuildRequires:	libxslt-progs
+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:	python >= 1:2.7
+BuildRequires:	python3 >= 1:3.5
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.527
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
 BuildRequires:	tar >= 1:1.22
@@ -64,12 +65,11 @@ BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires:	iconv
 Requires:	libmount >= 2.28
-Requires:	pcre >= 8.13
+%{?with_selinux:Requires:	libselinux >= 2.2}
+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)
@@ -130,10 +130,10 @@ Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libffi-devel >= 3.0.0
 Requires:	libmount-devel >= 2.28
-Requires:	pcre-devel >= 8.13
-Requires:	python-modules
+Requires:	pcre-devel >= 8.31
+Requires:	python3-modules >= 1:3.5
 # gio only
-%{?with_selinux:Requires:	libselinux-devel}
+%{?with_selinux:Requires:	libselinux-devel >= 2.2}
 Requires:	zlib-devel
 
 %description devel
@@ -180,9 +180,7 @@ Summary:	GLib API documetation
 Summary(pl.UTF-8):	Dokumentacja API GLib
 Group:		Documentation
 Requires:	gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 GLib API documetation.
@@ -212,9 +210,7 @@ Summary(pl.UTF-8):	Bashowe uzupełnianie nazw dla narzędzi gio
 Group:		Applications/Shells
 Requires:	bash-completion >= 2.0
 Obsoletes:	bash-completion-gdbus
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n bash-completion-gio
 bash-completion for gio utilities: gdbus and gsettings.
@@ -239,60 +235,39 @@ Sondy systemtap/dtrace dla GLib 2.
 %setup -q -n glib-%{version}
 %patch0 -p1
 
-%if %{without apidocs}
-%{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
-%{__sed} -e '/^docs.*Makefile$/d' -i configure.ac
-echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
-%endif
-
 %build
-%{?with_apidocs:%{__gtkdocize}}
-%{__libtoolize}
-%{__aclocal} -I m4macros
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-# -Wall CPPFLAGS is workaround for https://bugzilla.gnome.org/show_bug.cgi?id=698716
-%configure \
-	CPPFLAGS="%{rpmcppflags} -Wall" \
-	--enable-debug=%{?debug:yes} \
-	%{!?with_systemtap:--disable-dtrace} \
+%meson build \
+	%{?debug:--debug} \
+	-Ddtrace=%{__true_false systemtap} \
+	-Dsystemtap=%{__true_false systemtap} \
 %ifarch %{ix86}
-	%{?with_systemtap:--with-tapset-install-dir=%{_datadir}/systemtap/tapset/i386} \
+	%{?with_systemtap:-Dtapset_install_dir=%{_datadir}/systemtap/tapset/i386} \
 %endif
-	%{__enable_disable apidocs gtk-doc} \
-	%{__enable_disable selinux} \
-	--disable-silent-rules \
-	%{__enable_disable static_libs static} \
-	--enable-man \
-	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
-	--with-pcre=system
-
-# gtk-doc build requires UTF-8 locale
-LC_ALL=C.UTF-8 \
-%{__make}
+	-Dfam=%{__true_false fam} \
+	-Dgtk_doc=%{__true_false apidocs} \
+	-Dselinux=%{?with_selinux:enabled}%{!?with_selinux:disabled} \
+	-Dman=true \
+	-Dinternal_pcre=false
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	m4datadir=%{_aclocaldir} \
-	pkgconfigdir=%{_pkgconfigdir}
+install -d $RPM_BUILD_ROOT%{_libdir}/gio/modules
+
+%ninja_install -C build
 
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
 > $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.la \
-	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.a}
-
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
-
 %py_comp $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb
 %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
@@ -327,23 +302,20 @@ umask 022
 %attr(755,root,root) %ghost %{_libdir}/libgthread-2.0.so.0
 %dir %{_libdir}/gio
 %dir %{_libdir}/gio/modules
-%attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so
+%{?with_fam:%attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so}
 %ghost %{_libdir}/gio/modules/giomodule.cache
 %dir %{_datadir}/glib-2.0
 %dir %{_datadir}/glib-2.0/schemas
 %ghost %{_datadir}/glib-2.0/schemas/gschemas.compiled
-%if %{with apidocs}
 %{_mandir}/man1/gapplication.1*
 %{_mandir}/man1/gdbus.1*
 %{_mandir}/man1/gio.1*
 %{_mandir}/man1/gio-querymodules.1*
 %{_mandir}/man1/glib-compile-schemas.1*
 %{_mandir}/man1/gsettings.1*
-%endif
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog
 %attr(755,root,root) %{_bindir}/gdbus-codegen
 %attr(755,root,root) %{_bindir}/glib-compile-resources
 %attr(755,root,root) %{_bindir}/glib-genmarshal
@@ -369,11 +341,6 @@ umask 022
 %{_datadir}/glib-2.0/valgrind
 %{_datadir}/gettext/its/gschema.its
 %{_datadir}/gettext/its/gschema.loc
-%{_libdir}/libgio-2.0.la
-%{_libdir}/libglib-2.0.la
-%{_libdir}/libgmodule-2.0.la
-%{_libdir}/libgobject-2.0.la
-%{_libdir}/libgthread-2.0.la
 %{_pkgconfigdir}/gio-2.0.pc
 %{_pkgconfigdir}/gio-unix-2.0.pc
 %{_pkgconfigdir}/glib-2.0.pc
@@ -385,7 +352,6 @@ umask 022
 %{_aclocaldir}/glib-2.0.m4
 %{_aclocaldir}/glib-gettext.m4
 %{_aclocaldir}/gsettings.m4
-%if %{with apidocs}
 %{_mandir}/man1/gdbus-codegen.1*
 %{_mandir}/man1/glib-compile-resources.1*
 %{_mandir}/man1/glib-genmarshal.1*
@@ -395,7 +361,6 @@ umask 022
 %{_mandir}/man1/gresource.1*
 %{_mandir}/man1/gtester-report.1*
 %{_mandir}/man1/gtester.1*
-%endif
 
 %if %{with static_libs}
 %files static
@@ -423,10 +388,11 @@ umask 022
 
 %files -n bash-completion-gio
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/gapplication
-%{_datadir}/bash-completion/completions/gdbus
-%{_datadir}/bash-completion/completions/gresource
-%{_datadir}/bash-completion/completions/gsettings
+%{bash_compdir}/gapplication
+%{bash_compdir}/gdbus
+%{bash_compdir}/gio
+%{bash_compdir}/gresource
+%{bash_compdir}/gsettings
 
 %if %{with systemtap}
 %files -n systemtap-glib2