Accepting request 874124 from home:yecril71pl:branches:GNOME:Factory
- disable irrelevant warnings - use macros in spec file - simplify trigger code OBS-URL: https://build.opensuse.org/request/show/874124 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=448
This commit is contained in:
Git OBS Bridge
@@ -7,4 +7,11 @@ addFilter("glib2.*non-conffile-in-etc.*[zzz\-glib2.*|macros\.glib2]")
|
||||
# Filter for env-script-intepreter for the following files under
|
||||
# /usr/bin directory: gdbus-codegen, glib-genmarshal and glib-mkenums
|
||||
addFilter(".*env-script-interpreter.*/usr/bin/[gdbus\-codegen|glib\-.*].*")
|
||||
|
||||
# allow empty files and certificates in tests
|
||||
addFilter(".*: W: zero-length /usr/libexec/installed-tests/glib/.*")
|
||||
addFilter(".*: W: pem-certificate /usr/libexec/installed-tests/.*")
|
||||
# disable bogus warnings, as instructed by upstream
|
||||
addFilter(".*: W: shared-lib-without-dependency-information .*")
|
||||
# the maintainers prefer to keep the following internal SUSE naming conflicts
|
||||
addFilter(".*: W: no-dependency-on glib2.*")
|
||||
addFilter(".*: W: suse-branding-.*")
|
||||
|
||||
@@ -13,6 +13,13 @@ Thu Feb 11 13:33:20 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
+ Bugs fixed: glgo#GNOME/GLib!1933, glgo#GNOME/GLib!1943,
|
||||
glgo#GNOME/GLib!1944, glgo#GNOME/GLib!1945.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 11 11:06:17 UTC 2021 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
|
||||
|
||||
- disable irrelevant warnings
|
||||
- use macros in spec file
|
||||
- simplify trigger code
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 5 10:59:15 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
149
glib2.spec
149
glib2.spec
@@ -47,14 +47,10 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch
|
||||
Patch3: glib2-dbus-socket-path.patch
|
||||
# PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
|
||||
Patch4: glib2-gdbus-codegen-version.patch
|
||||
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gamin-devel
|
||||
BuildRequires: gcc-c++
|
||||
%if %{with gtk_doc}
|
||||
BuildRequires: gtk-doc >= 1.32
|
||||
%endif
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: m4
|
||||
BuildRequires: meson >= 0.49.2
|
||||
@@ -72,6 +68,9 @@ BuildRequires: pkgconfig(mount) >= 2.28
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# gtk-doc requires glib2-devel, but we will only be building this here; break up a cycle
|
||||
#!BuildIgnore: glib2-devel
|
||||
%if %{with gtk_doc}
|
||||
BuildRequires: gtk-doc >= 1.32
|
||||
%endif
|
||||
%if %{with systemtap}
|
||||
BuildRequires: systemtap-dtrace
|
||||
BuildRequires: systemtap-headers
|
||||
@@ -82,12 +81,19 @@ GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
%define libver 2_0-0
|
||||
%define libgio libgio-%{libver}
|
||||
%define libglib libglib-%{libver}
|
||||
%define libgmodule libgmodule-%{libver}
|
||||
%define libgobject libgobject-%{libver}
|
||||
%define libgthread libgthread-%{libver}
|
||||
|
||||
%package tools
|
||||
Summary: Tools from glib2, a general-purpose utility library
|
||||
# ensure libgio-2_0-0 is updated before glib2-tools' ensures glib-compile-schema to
|
||||
# be functional when the file trigger fires (boo#1178713)
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires(post): libgio-2_0-0 = %{version}
|
||||
Requires(post): %{libgio} = %{version}
|
||||
|
||||
%description tools
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
@@ -97,8 +103,8 @@ a main loop abstraction, and so on.
|
||||
%package -n gio-branding-upstream
|
||||
Summary: Upstream definitions of default settings and applications
|
||||
Group: System/Libraries
|
||||
Requires: libgio-2_0-0 = %{version}
|
||||
Supplements: packageand(libgio-2_0-0:branding-upstream)
|
||||
Requires: %{libgio} = %{version}
|
||||
Supplements: (%{libgio} and branding-upstream)
|
||||
Conflicts: gio-branding
|
||||
Provides: %{name}-branding-upstream = %{version}
|
||||
Obsoletes: %{name}-branding-upstream < %{version}
|
||||
@@ -123,18 +129,18 @@ GSettings and applications used by the MIME system.
|
||||
Summary: Development files for glib, a general-purpose utility library
|
||||
# Now require the subpackages too
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{libgio} = %{version}
|
||||
Requires: %{libglib} = %{version}
|
||||
Requires: %{libgmodule} = %{version}
|
||||
Requires: %{libgobject} = %{version}
|
||||
Requires: %{libgthread} = %{version}
|
||||
Requires: glib2-tools = %{version}
|
||||
Requires: glibc-devel
|
||||
Requires: libgio-2_0-0 = %{version}
|
||||
Requires: libglib-2_0-0 = %{version}
|
||||
Requires: libgmodule-2_0-0 = %{version}
|
||||
Requires: libgobject-2_0-0 = %{version}
|
||||
Requires: libgthread-2_0-0 = %{version}
|
||||
Requires: pkgconfig
|
||||
# Required by gdbus-codegen
|
||||
Requires: python3-xml
|
||||
Provides: glib2-doc = 2.19.6
|
||||
Obsoletes: glib2-doc < 2.19.6
|
||||
Provides: %{name}-doc = 2.19.6
|
||||
Obsoletes: %{name}-doc < 2.19.6
|
||||
#
|
||||
|
||||
%description devel
|
||||
@@ -156,23 +162,23 @@ a main loop abstraction, and so on.
|
||||
|
||||
This package contains static versions of the GLib libraries.
|
||||
|
||||
%package -n libglib-2_0-0
|
||||
%package -n %{libglib}
|
||||
Summary: General-Purpose Utility Library
|
||||
Group: System/Libraries
|
||||
Provides: %{name} = %{version}
|
||||
Obsoletes: %{name} < %{version}
|
||||
#
|
||||
|
||||
%description -n libglib-2_0-0
|
||||
%description -n %{libglib}
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
%package -n libgmodule-2_0-0
|
||||
%package -n %{libgmodule}
|
||||
Summary: General-Purpose Utility Library -- Library for Modules
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgmodule-2_0-0
|
||||
%description -n %{libgmodule}
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
@@ -180,12 +186,12 @@ a main loop abstraction, and so on.
|
||||
The libgmodule library provides a portable way to dynamically load
|
||||
object files (commonly known as 'plug-ins').
|
||||
|
||||
%package -n libgio-2_0-0
|
||||
%package -n %{libgio}
|
||||
Summary: A virtual file system library API
|
||||
Group: System/Libraries
|
||||
# The tools are useful for people having libgio
|
||||
# bnc#555605: shared-mime-info is required by libgio to properly detect mime types, but not during build
|
||||
#!BuildIgnore: shared-mime-info
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-tools
|
||||
# bnc#678518: libgio interacts with others by means of dbus-launch
|
||||
Requires: dbus-launch
|
||||
@@ -196,7 +202,7 @@ Provides: gio = %{version}
|
||||
# Temporarily disable this, pending further discussion
|
||||
# Recommends: gvfs
|
||||
|
||||
%description -n libgio-2_0-0
|
||||
%description -n %{libgio}
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
@@ -209,7 +215,7 @@ Summary: GIO module to use FAM
|
||||
Group: System/Libraries
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Supplements: packageand(libgio-2_0-0:fam)
|
||||
Supplements: (libgio-2_0-0 and fam)
|
||||
|
||||
%description -n libgio-fam
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
@@ -218,11 +224,11 @@ a main loop abstraction, and so on.
|
||||
|
||||
This packages provides a GIO module to use FAM for file monitoring.
|
||||
|
||||
%package -n libgthread-2_0-0
|
||||
%package -n %{libgthread}
|
||||
Summary: Portable API from glib wrapping system threads
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgthread-2_0-0
|
||||
%description -n %{libgthread}
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
@@ -230,11 +236,11 @@ a main loop abstraction, and so on.
|
||||
The libgthread library provides a portable way to write multi-threaded
|
||||
software.
|
||||
|
||||
%package -n libgobject-2_0-0
|
||||
%package -n %{libgobject}
|
||||
Summary: Object-Oriented Framework for C
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgobject-2_0-0
|
||||
%description -n %{libgobject}
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
@@ -245,8 +251,9 @@ The GObject library provides an object-oriented framework for C.
|
||||
Summary: Tests for the glib2 package
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-devel = %{version}
|
||||
Provides: glib2-tests = %version-%release
|
||||
Obsoletes: glib2-tests < %version-%release
|
||||
Requires: %{name}-tests = %{version}-%{release}
|
||||
Provides: %{name}-tests = %{version}-%{release}
|
||||
Obsoletes: %{name}-tests < %{version}-%{release}
|
||||
|
||||
%description tests-devel
|
||||
The glib2-tests-devel package contains tests that can be used to verify
|
||||
@@ -305,61 +312,50 @@ install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh
|
||||
install -D -m0644 gnome_defaults.conf %{buildroot}%{_sysconfdir}/gnome_defaults.conf
|
||||
# default apps magic
|
||||
mkdir -p %{buildroot}%{_localstatedir}/cache/gio-2.0 %{buildroot}%{_datadir}/applications
|
||||
touch %{buildroot}%{_localstatedir}/cache/gio-2.0/gnome-mimeapps.list
|
||||
touch %{buildroot}%{_localstatedir}/cache/gio-2.0/xfce-mimeapps.list
|
||||
touch %{buildroot}%{_localstatedir}/cache/gio-2.0/lxde-mimeapps.list
|
||||
>> %{buildroot}%{_localstatedir}/cache/gio-2.0/gnome-mimeapps.list
|
||||
>> %{buildroot}%{_localstatedir}/cache/gio-2.0/xfce-mimeapps.list
|
||||
>> %{buildroot}%{_localstatedir}/cache/gio-2.0/lxde-mimeapps.list
|
||||
ln -s %{_localstatedir}/cache/gio-2.0/gnome-mimeapps.list %{buildroot}%{_datadir}/applications/gnome-mimeapps.list
|
||||
# gio-querymodules magic
|
||||
%if "%{_lib}" == "lib64"
|
||||
mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-64
|
||||
mv -T %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-64
|
||||
%endif
|
||||
mkdir -p %{buildroot}%{_libdir}/gio/modules
|
||||
touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
|
||||
>> %{buildroot}%{_libdir}/gio/modules/giomodule.cache
|
||||
# gsettings magic
|
||||
touch %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
|
||||
>> %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
|
||||
# Install rpm macros
|
||||
mkdir -p %{buildroot}%{_rpmmacrodir}
|
||||
cp %{SOURCE6} %{buildroot}%{_rpmmacrodir}
|
||||
cp -t%{buildroot}%{_rpmmacrodir} %{SOURCE6}
|
||||
# Install zsh completion for gsettings
|
||||
mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/
|
||||
cp %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings
|
||||
cp -T %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings
|
||||
mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
|
||||
%fdupes %{buildroot}/%{_prefix}
|
||||
|
||||
%filetriggerin -n glib2-tools -- %{_datadir}/glib-2.0/schemas
|
||||
# Too many users complain about schemas compiled with wrong permissions
|
||||
# when in fact the system just honors there umask setting
|
||||
# Let's reset umask to 022 for glib-compile-schemas, then reset to
|
||||
# what the user had configured
|
||||
UMASK=$(umask)
|
||||
umask 022
|
||||
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas
|
||||
umask $UMASK
|
||||
unset UMASK
|
||||
# when in fact the system just honours there umask setting
|
||||
# subshell restores umask for paranoia mode
|
||||
%define compile_schemas \
|
||||
(umask 022 && %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas)
|
||||
|
||||
%filetriggerin -n glib2-tools -- %{_datadir}/glib-2.0/schemas
|
||||
%{compile_schemas}
|
||||
|
||||
%filetriggerpostun -n glib2-tools -- %{_datadir}/glib-2.0/schemas
|
||||
# Too many users complain about schemas compiled with wrong permissions
|
||||
# when in fact the system just honors there umask setting
|
||||
# Let's reset umask to 022 for glib-compile-schemas, then reset to
|
||||
# what the user had configured
|
||||
UMASK=$(umask)
|
||||
umask 022
|
||||
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas
|
||||
umask $UMASK
|
||||
unset UMASK
|
||||
%{compile_schemas}
|
||||
|
||||
%post -n libglib-2_0-0 -p /sbin/ldconfig
|
||||
%post -n libgobject-2_0-0 -p /sbin/ldconfig
|
||||
%post -n libgthread-2_0-0 -p /sbin/ldconfig
|
||||
%post -n libgio-2_0-0
|
||||
/sbin/ldconfig
|
||||
for ENV in gnome xfce lxde ; do
|
||||
if ! test -f %{_localstatedir}/cache/gio-2.0/$ENV-mimeapps.list ; then
|
||||
cat >%{_localstatedir}/cache/gio-2.0/$ENV-mimeapps.list <<EOF
|
||||
# Dummy file. Install desktop-file-utils to get a better defaults.
|
||||
%post -n %{libglib} -p /sbin/ldconfig
|
||||
%post -n %{libgobject} -p /sbin/ldconfig
|
||||
%post -n %{libgthread} -p /sbin/ldconfig
|
||||
%post -n %{libgio}
|
||||
%{ldconfig}
|
||||
for ENV in gnome xfce lxde
|
||||
do mimeapps="%{_localstatedir}/cache/gio-2.0/$ENV-mimeapps.list" &&
|
||||
<"${mimeapps}" || cat >"${mimeapps}" <<EOF
|
||||
# Dummy file. Install desktop-file-utils to get better defaults.
|
||||
[Default Applications]
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
|
||||
%check
|
||||
@@ -379,11 +375,11 @@ done
|
||||
%{_bindir}/gio-querymodules %{_libdir}/gio/modules
|
||||
%endif
|
||||
|
||||
%postun -n libglib-2_0-0 -p /sbin/ldconfig
|
||||
%postun -n libgobject-2_0-0 -p /sbin/ldconfig
|
||||
%postun -n libgthread-2_0-0 -p /sbin/ldconfig
|
||||
%postun -n libgio-2_0-0 -p /sbin/ldconfig
|
||||
%postun -n libgmodule-2_0-0 -p /sbin/ldconfig
|
||||
%postun -n %{libglib} -p %{ldconfig}
|
||||
%postun -n %{libgobject} -p %{ldconfig}
|
||||
%postun -n %{libgthread} -p %{ldconfig}
|
||||
%postun -n %{libgio} -p %{ldconfig}
|
||||
%postun -n %{libgmodule} -p %{ldconfig}
|
||||
%postun -n libgio-fam
|
||||
%if 0
|
||||
###############################################################################
|
||||
@@ -433,24 +429,24 @@ done
|
||||
%doc README.Gsettings-overrides
|
||||
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
|
||||
|
||||
%files -n libglib-2_0-0
|
||||
%files -n %{libglib}
|
||||
%license COPYING
|
||||
%doc AUTHORS README NEWS
|
||||
%{_libdir}/libglib*.so.*
|
||||
|
||||
%files -n libgmodule-2_0-0
|
||||
%files -n %{libgmodule}
|
||||
%license COPYING
|
||||
%{_libdir}/libgmodule*.so.*
|
||||
|
||||
%files -n libgobject-2_0-0
|
||||
%files -n %{libgobject}
|
||||
%license COPYING
|
||||
%{_libdir}/libgobject*.so.*
|
||||
|
||||
%files -n libgthread-2_0-0
|
||||
%files -n %{libgthread}
|
||||
%license COPYING
|
||||
%{_libdir}/libgthread*.so.*
|
||||
|
||||
%files -n libgio-2_0-0
|
||||
%files -n %{libgio}
|
||||
%license COPYING
|
||||
%{_libdir}/libgio*.so.*
|
||||
%dir %{_libdir}/gio
|
||||
@@ -537,9 +533,14 @@ done
|
||||
%files lang -f glib20.lang
|
||||
%license COPYING
|
||||
|
||||
%define testdir %{_libexecdir}/installed-tests/glib
|
||||
|
||||
%files tests-devel
|
||||
%license COPYING
|
||||
%{_libexecdir}/installed-tests
|
||||
%attr(0444 - -) %{testdir}/x-content/win32-software/autorun.exe
|
||||
%attr(0755 - -) %{testdir}/taptestrunner.py
|
||||
%attr(0755 - -) %{testdir}/x-content/unix-software/autorun.sh
|
||||
%{_datadir}/installed-tests
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user