Accepting request 75630 from home:vuntz:branches:GNOME:Factory
Fix build + complete branding doc OBS-URL: https://build.opensuse.org/request/show/75630 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=150
This commit is contained in:
parent
10e8c54a03
commit
9c08122c5a
13
glib2.spec
13
glib2.spec
@ -110,8 +110,11 @@ Supplements: packageand(libgio-2_0-0:branding-upstream)
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
#BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
|
#BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
|
||||||
#BRAND: applications as preferred defaults.
|
#BRAND: applications as preferred defaults.
|
||||||
#BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override can be
|
#BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override file can
|
||||||
#BRAND: used to override the default value for a GSettings key.
|
#BRAND: be used to override the default value for GSettings keys. See
|
||||||
|
#BRAND: README.Gsettings-overrides for more details. The branding
|
||||||
|
#BRAND: package should then have proper Requires for features changed
|
||||||
|
#BRAND: with such an override file.
|
||||||
# NOTE: gnome_defaults is not an upstream feature, but a SuSE
|
# NOTE: gnome_defaults is not an upstream feature, but a SuSE
|
||||||
# enhancement, but to conform branding conventions, the package is named
|
# enhancement, but to conform branding conventions, the package is named
|
||||||
# as gio-branding-upstream.
|
# as gio-branding-upstream.
|
||||||
@ -267,10 +270,10 @@ translation-update-upstream
|
|||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
%patch12 -p1
|
%patch12 -p1
|
||||||
cp -a %{S:1} %{S:2} %{S:3} .
|
cp -a %{S:1} %{S:2} %{S:3} %{S:5} .
|
||||||
cp -a %{S:4} gnome_defaults.conf
|
cp -a %{S:4} gnome_defaults.conf
|
||||||
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
|
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
|
||||||
cp -a %{S:6} m4macros/
|
cp -a %{S:7} m4macros/
|
||||||
fi
|
fi
|
||||||
%if 0%{?BUILD_FROM_VCS}
|
%if 0%{?BUILD_FROM_VCS}
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
@ -326,7 +329,7 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
|||||||
rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
|
rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
|
||||||
# Install rpm macros
|
# Install rpm macros
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||||
cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
|
cp %{S:6} %{buildroot}%{_sysconfdir}/rpm
|
||||||
%fdupes %{buildroot}
|
%fdupes %{buildroot}
|
||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
|
Loading…
Reference in New Issue
Block a user