From f4f84e38f4f51aaca5b713b94d9778d230f269aa Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:06:53 +0100 Subject: [PATCH] update to 2.60.4 [release 2.60.4-1mamba;Sat Jul 06 2019] --- glib.spec | 85 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/glib.spec b/glib.spec index 2e68f94..4ffa67f 100644 --- a/glib.spec +++ b/glib.spec @@ -5,7 +5,7 @@ %endif %define majver %(echo %version | cut -d. -f 1-2) Name: glib -Version: 2.56.1 +Version: 2.60.4 Release: 1mamba Epoch: 2 Summary: A handy library of utility functions @@ -25,14 +25,14 @@ BuildRequires: glibc-devel %if "%{stage1}" != "1" BuildRequires: libelf-devel BuildRequires: libffi-devel -BuildRequires: libgamin-devel +BuildRequires: libmount-devel +BuildRequires: libpcre-devel BuildRequires: libselinux-devel -%endif BuildRequires: libz-devel +## AUTOBUILDREQ-END %if "%{stage1}" != "1" BuildRequires: perl-devel %endif -## AUTOBUILDREQ-END %if "%{stage1}" != "1" BuildRequires: gtk-doc %endif @@ -149,41 +149,38 @@ This package contains libraries and header files needed for development. %prep %setup -q -%patch0 -p1 +#-D -T +#:<< _EOF +#%patch0 -p1 #autoconf - +sed -i "s|python3|python3.6|" meson.build + %build -%if "%{_build}" != "%{_host}" -cat > config.cache << _EOF -glib_cv_stack_grows=no -glib_cv_uscore=no -ac_cv_func_posix_getgrgid_r=yes -ac_cv_func_posix_getpwuid_r=yes -_EOF -%endif +#:<< _EOF +%meson \ + -Dman=true \ + -Dgtk_doc=true -./autogen.sh +%meson_build -%configure \ -%if "%{with_systemtap}" == "1" - --enable-systemtap \ -%else - --disable-systemtap \ - --disable-dtrace \ -%endif - --enable-static \ -%if "%{stage1}" == "1" - %{LIBFFI_CFLAGS} \ -%endif -%if "%{_build}" != "%{_host}" - --cache-file=config.cache -%endif - -%make +#% configure \ +#%if "%{with_systemtap}" == "1" +# --enable-systemtap \ +#%else +# --disable-systemtap \ +# --disable-dtrace \ +#%endif +# --enable-static \ +#%if "%{stage1}" == "1" +# %{LIBFFI_CFLAGS} \ +#%endif +#%if "%{_build}" != "%{_host}" +# --cache-file=config.cache +#%endif %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%meson_install mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d @@ -237,10 +234,10 @@ _EOF %{_libdir}/libgobject-2.0.so.* %{_libdir}/libgthread-2.0.so.* %{_libdir}/libgio-2.0.so.* -%if "%{stage1}" != "1" -%{_libdir}/gio/modules/libgiofam.la -%{_libdir}/gio/modules/libgiofam.so -%endif +#%if "%{stage1}" != "1" +#%{_libdir}/gio/modules/libgiofam.la +#%{_libdir}/gio/modules/libgiofam.so +#%endif %{_bindir}/glib-compile-schemas %dir %{_datadir}/glib-2.0 %dir %{_datadir}/glib-2.0/schemas @@ -250,6 +247,7 @@ _EOF %defattr(-,root,root) %{_bindir}/gapplication %{_bindir}/gio +%{_bindir}/gio-launch-desktop %{_bindir}/glib-compile-resources %{_bindir}/gresource %{_bindir}/gtester @@ -262,11 +260,6 @@ _EOF %{_includedir}/%{name}-?.?/* %{_includedir}/gio-unix-?.?/*gio/*.h %{_libdir}/%{name}-?.?/include/%{name}config.h -%{_libdir}/libglib-2.0.la -%{_libdir}/libgmodule-2.0.la -%{_libdir}/libgobject-2.0.la -%{_libdir}/libgthread-2.0.la -%{_libdir}/libgio-2.0.la %{_libdir}/libglib-2.0.so %{_libdir}/libgmodule-2.0.so %{_libdir}/libgobject-2.0.so @@ -274,6 +267,7 @@ _EOF %{_libdir}/libgio-2.0.so %{_datadir}/bash-completion/completions/gapplication %{_datadir}/bash-completion/completions/gresource +%{_datadir}/bash-completion/completions/gio %{_datadir}/gettext/its/gschema.* %{_datadir}/aclocal/glib-?.?.m4 %if "%{with_systemtap}" == "1" @@ -283,9 +277,9 @@ _EOF %{_libdir}/pkgconfig/* %{_mandir}/man1/* -%files -n libglib-static -%defattr(-,root,root) -%{_libdir}/libg*.a +#%files -n libglib-static +#%defattr(-,root,root) +#%{_libdir}/libg*.a %files -n python-glib %defattr(-,root,root) @@ -340,6 +334,9 @@ _EOF %endif %changelog +* Sat Jul 06 2019 Silvan Calarco 2.60.4-1mamba +- update to 2.60.4 + * Sat Aug 11 2018 Silvan Calarco 2.56.1-1mamba - update to 2.56.1