Add a gtk-update-icon-cache subpackage

Instead of building it as part of gtk2, move gtk-update-icon-cache here
and package it up in a subpackage. This makes it possible for both gtk2
and gtk3 to depend on the new subpackage.
This commit is contained in:
Kalev Lember 2014-12-17 14:23:06 +01:00
parent d360626d79
commit 791296421c

View File

@ -35,7 +35,6 @@ BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: cairo-gobject-devel >= %{cairo_version} BuildRequires: cairo-gobject-devel >= %{cairo_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf_version} BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf_version}
BuildRequires: gtk2-devel
BuildRequires: libXi-devel BuildRequires: libXi-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gtk-doc BuildRequires: gtk-doc
@ -66,6 +65,8 @@ BuildRequires: libxkbcommon-devel
Requires: adwaita-icon-theme Requires: adwaita-icon-theme
# required for icon theme apis to work # required for icon theme apis to work
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
# split out in a subpackage
Requires: gtk-update-icon-cache
# We need to prereq these so we can run gtk-query-immodules-3.0 # We need to prereq these so we can run gtk-query-immodules-3.0
Requires(post): glib2%{?_isa} >= %{glib2_version} Requires(post): glib2%{?_isa} >= %{glib2_version}
@ -96,6 +97,17 @@ suites.
This package contains version 3 of GTK+. This package contains version 3 of GTK+.
%package -n gtk-update-icon-cache
Summary: Icon theme caching utility
# gtk-update-icon-cache used to be shipped in the gtk2 package
Conflicts: gtk2 < 2.24.25-2
%description -n gtk-update-icon-cache
GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot of
system call and disk seek overhead when the application starts. Since the
format of the cache files allows them to be mmap()ed shared between multiple
applications, the overall memory consumption is reduced as well.
%package immodules %package immodules
Summary: Input methods for GTK+ Summary: Input methods for GTK+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -152,7 +164,6 @@ the functionality of the installed %{name} package.
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
%configure $CONFIGFLAGS \ %configure $CONFIGFLAGS \
--enable-gtk2-dependency \
--enable-xkb \ --enable-xkb \
--enable-xinerama \ --enable-xinerama \
--enable-xrandr \ --enable-xrandr \
@ -257,7 +268,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache %ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
%{_mandir}/man1/gtk-query-immodules-3.0* %{_mandir}/man1/gtk-query-immodules-3.0*
%{_mandir}/man1/gtk-launch.1.gz %{_mandir}/man1/gtk-launch.1.gz
%exclude %{_mandir}/man1/gtk-update-icon-cache.1.gz
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
@ -267,6 +277,11 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%{_mandir}/man1/broadwayd.1* %{_mandir}/man1/broadwayd.1*
%endif %endif
%files -n gtk-update-icon-cache
%doc COPYING
%{_bindir}/gtk-update-icon-cache
%{_mandir}/man1/gtk-update-icon-cache.1*
%files immodules %files immodules
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so %{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so
@ -322,6 +337,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%changelog %changelog
* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.3-1 * Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.3-1
- Update to 3.15.3 - Update to 3.15.3
- Add gtk-update-icon-cache subpackage that both gtk2 and gtk3 can depend on
* Mon Nov 24 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.2-1 * Mon Nov 24 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.2-1
- Update to 3.15.2 - Update to 3.15.2