Accepting request 581167 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581167
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=309
This commit is contained in:
2018-03-05 13:51:43 +00:00
committed by Git OBS Bridge
parent 023391b4a7
commit ba50b2c3ac
3 changed files with 42 additions and 136 deletions

View File

@@ -23,18 +23,16 @@
%else
%define build_wayland_backend 1
%endif
# When updating the binary version, do not forget to also update baselibs.conf
%define gtk_binary_version 3.0.0
Name: gtk3
%define _name gtk+
Name: gtk3
Version: 3.22.28
Release: 0
Summary: The GTK+ toolkit library (version 3)
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Libraries/X11
Url: http://www.gtk.org/
URL: http://www.gtk.org/
Source: http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz
Source1: README.SUSE
Source2: settings.ini
@@ -42,8 +40,6 @@ Source3: macros.gtk3
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
Patch0: gtk3-GTK_PATH64.patch
# PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE
Patch1: gtk3-path-local.patch
# PATCH-FIX-OPENSUSE gtk3-restore-filechooser-click-behavior.patch bgo#758065 bsc#1057471 yfjiang@suse.com -- revert upstream commit#fb0a13b to restore the single click behavior
Patch3: gtk3-restore-filechooser-click-behavior.patch
# PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96
@@ -52,12 +48,8 @@ BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gettext-tools-mini >= 0.19.7
# Needed for patch1
# BuildRequires: gnome-common
BuildRequires: hicolor-icon-theme
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
BuildRequires: pkgconfig
BuildRequires: xsltproc
BuildRequires: pkgconfig(atk) >= 2.15.1
BuildRequires: pkgconfig(atk-bridge-2.0)
@@ -84,6 +76,9 @@ BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xrandr)
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%if %{build_wayland_backend}
BuildRequires: pkgconfig(wayland-client) >= 1.9.90
BuildRequires: pkgconfig(wayland-cursor)
@@ -91,7 +86,6 @@ BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols) >= 1.7
BuildRequires: pkgconfig(xkbcommon)
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -101,19 +95,19 @@ ranging from small one-off projects to complete application suites.
%package -n libgtk-3-0
Summary: The GTK+ toolkit library (version 3)
Group: System/Libraries
Requires(post): %{name}-tools
Requires: %{name}-data >= %{version}
Requires: %{name}-schema >= %{version}
# While hicolor is not a Requires strictly speaking, we put it as
# such instead of as a Recommends because many applications just
# assume it's there and we need to have a low-level package to
# bring it in.
Requires: hicolor-icon-theme
# Require Adwaita Icon Theme: It's GTKs icon set, that's guaranteed to be there
Requires: adwaita-icon-theme
# Require gdk-pixbuf-loader-rsvg - bsc#1007453. We require adwaita-icon-theme
# so we need something to load the svg icons.
Requires: gdk-pixbuf-loader-rsvg
# While hicolor is not a Requires strictly speaking, we put it as
# such instead of as a Recommends because many applications just
# assume it's there and we need to have a low-level package to
# bring it in.
Requires: hicolor-icon-theme
Requires(post): %{name}-tools
# gtk+ can work without branding/translations. Built in defaults will be used then.
Recommends: %{name}-branding
# it's nice to have input modules for various locales installed by default
@@ -306,9 +300,9 @@ ranging from small one-off projects to complete application suites.
Summary: Upstream theme configuration for the GTK+ toolkit library v3
Group: System/Libraries
Requires: libgtk-3-0 = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
Conflicts: %{name}-branding
Provides: %{name}-branding = %{version}
BuildArch: noarch
#BRAND: Provides /etc/gtk-3.0/settings.ini, to define default theme and icon
#BRAND: theme.
@@ -346,6 +340,7 @@ Group: Development/Libraries/X11
This package enhances gettext with an International Tag Set for GTK+ 3
%lang_package
%prep
%setup -q -n %{_name}-%{version}
%if !0%{?is_opensuse}
@@ -361,18 +356,14 @@ for LNG in po/*.po ; do
fi
done
%endif
%if "%_lib" == "lib64"
cp -a %{S:1} .
%if "%{_lib}" == "lib64"
cp -a %{SOURCE1} .
%patch0 -p1
%endif
# Patch disabled, needs rebase.
#patch1 -p0
%patch3 -p1
%patch4 -p1
%build
# Disabled since patch 1 is in need of rebase
# NOCONFIGURE=1 ./autogen.sh
%configure \
--disable-static \
--enable-man \
@@ -390,14 +381,14 @@ make %{?_smp_mflags}
%install
%make_install
find %{buildroot}%{_libdir} -name '*.la' -delete -print
find %{buildroot} -type f -name "*.la" -delete -print
# Do not install the exampleapp glib schema, as the app itself is noinst
rm %{buildroot}%{_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
%find_lang gtk30
%find_lang gtk30-properties
install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
install -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
%if "%_lib" == "lib64"
%if "%{_lib}" == "lib64"
mv %{buildroot}%{_bindir}/gtk-query-immodules-3.0 %{buildroot}%{_bindir}/gtk-query-immodules-3.0-64
mv %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0.1 %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0-64.1
%endif
@@ -415,7 +406,7 @@ mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/ma
ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{ext_man} %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1%{ext_man}
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm
%fdupes %{buildroot}%{_datadir}
%fdupes %{buildroot}%{_libdir}
@@ -424,7 +415,7 @@ cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
###########################################################################
# Convenient %define for the scriplets
%if "%_lib" == "lib64"
%if "%{_lib}" == "lib64"
%define _gtk_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
%else
%define _gtk_query_immodules %{_bindir}/gtk-query-immodules-3.0
@@ -518,7 +509,6 @@ fi
%endif
%postun -n libgtk-3-0 -p /sbin/ldconfig
%postun immodule-amharic
%{_gtk_query_immodules_update_cache}
@@ -559,9 +549,9 @@ fi
%icon_theme_cache_post
%files -n libgtk-3-0
%defattr(-, root, root)
%doc AUTHORS COPYING README NEWS
%if "%_lib" == "lib64"
%license COPYING
%doc AUTHORS README NEWS
%if "%{_lib}" == "lib64"
%doc README.SUSE
%endif
%dir %{_sysconfdir}/gtk-3.0
@@ -584,48 +574,38 @@ fi
%{_libdir}/libgtk-3.so.*
%files -n typelib-1_0-Gtk-3_0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/Gdk-3.0.typelib
%{_libdir}/girepository-1.0/GdkX11-3.0.typelib
%{_libdir}/girepository-1.0/Gtk-3.0.typelib
%files immodule-amharic
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-am-et.so
%files immodule-broadway
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-broadway.so
%files immodule-inuktitut
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-inuktitut.so
%files immodule-multipress
%defattr(-,root,root)
%doc modules/input/README.multipress
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-multipress.so
%config %{_sysconfdir}/gtk-3.0/im-multipress.conf
%files immodule-thai
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-thai.so
%files immodules-tigrigna
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-ti-er.so
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-ti-et.so
%files immodule-vietnamese
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-viqr.so
%files immodule-xim
%defattr(-,root,root)
%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-xim.so
%files tools
%defattr(-,root,root)
%{_bindir}/broadwayd
%{_bindir}/gtk3-icon-browser
%{_bindir}/gtk-builder-tool
@@ -649,7 +629,6 @@ fi
%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{?ext_man}
%files schema
%defattr(-,root,root)
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
@@ -657,18 +636,15 @@ fi
%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
%files data
%defattr(-,root,root)
%{_datadir}/themes/Default/
%{_datadir}/themes/Emacs/
%files branding-upstream
%defattr(-,root,root)
%config %{_sysconfdir}/gtk-3.0/settings.ini
%files lang -f gtk30.lang -f gtk30-properties.lang
%files devel
%defattr(-,root,root)
%doc ChangeLog
%doc %{_datadir}/gtk-doc/html/gail-libgail-util3/
%doc %{_datadir}/gtk-doc/html/gdk3/
@@ -715,7 +691,6 @@ fi
%{_sysconfdir}/rpm/macros.gtk3
%files -n gettext-its-%{name}
%defattr(-,root,root)
%dir %{_datadir}/gettext/
%dir %{_datadir}/gettext/its/
%{_datadir}/gettext/its/gtkbuilder.its