Accepting request 61102 from GNOME:Factory

Accepted submit request 61102 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/61102
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=12
This commit is contained in:
Ruediger Oertel 2011-02-14 00:06:35 +00:00 committed by Git OBS Bridge
commit 0cca5e481d
7 changed files with 111 additions and 61 deletions

View File

@ -5,9 +5,11 @@ gtk3-tools
post "%else"
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-3.0/3.0.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache; fi; fi"
post "%endif"
libgtk-3_0-0
libgtk-3-0
requires "gtk3-tools-<targettype>"
provides "gtk3-<targettype> = <version>"
provides "libgtk-3_0-0-<targettype> = <version>"
obsoletes "libgtk-3_0-0-<targettype> < <version>"
post "%if "%_lib" == "lib64""
post "if test -f <prefix>%{_bindir}/gtk-query-immodules-3.0-64; then <prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi"
post "%else"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fca4b39359e7ab9532aaf826518ef5d3f6ba5174799883f8b0975783f76db4ad
size 17240205

3
gtk+-3.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec0729bf28f09a16e0b0a6a588556c7cee091f40426505b3694a9488bf6cbf67
size 16617063

View File

@ -1,3 +1,71 @@
-------------------------------------------------------------------
Sun Feb 13 22:10:29 CET 2011 - vuntz@opensuse.org
- Add Provides/Obsoletes for libgtk-3_0-0 to libgtk-3-0 since there
are some files that are shared between the two and some users
might have libgtk-3_0-0 already.
- Remove default gtkrc that was used in branding-upstream, and
replace it with a settings.ini file, since this is the new
mechanism.
-------------------------------------------------------------------
Fri Feb 11 06:27:00 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0:
+ Library sonames have been changed from libgdk-3.0 and
libgtk-3.0 to libgdk-3 and libgtk-3.
+ Bugs fixed: bgo#632775, bgo#639846, bgo#639945, bgo#640801,
bgo#641196, bgo#641302, bgo#641367, bgo#641409, bgo#641429,
bgo#641431, bgo#641517, bgo#641558, bgo#641621, bgo#641640.
+ Updated translations.
- Rename library package accordingly with new library soname.
- Remove update-alternatives mechanism for gtk-builder-convert
since the tool is not in gtk3 anymore. Also remove python-xml
Requires of devel package, which was there only for this tool.
-------------------------------------------------------------------
Thu Feb 3 16:06:36 CET 2011 - dimstar@opensuse.org
- Update to version 2.99.3:
+ This release adds some forgotten padding to class structs,
and thus breaks ABI for a last time before 3.0
+ Many Introspection annotation improvements
+ We no longer build the gtk-update-icon-cache utility, and
use a preexisting one, if --enable-gtk2-dependency is passed
to configure
+ GtkBuilder can now fill GtkComboBoxText and GtkMenuToolButton
widgets with data, as well as GtkFileFilters and
GtkTextTagTables
+ GtkImage now has a ::use-fallback property to allow generic
fallback with GIcons and icon-names (e.g. for symbolic icons)
+ There's a new gtk_text_view_get_cursor_locations() to enable
popup-at-cursor functionality
+ The application chooser widgets can now set a custom dialog
heading
+ The file chooser and application chooser widgets have received
minor visual improvements
+ gtk-auto-mnemonics is now backed by an XSetting
+ Defaults for GtkSettings, as well as theme-specific settings,
are now read from key files
+ Key themes are now supported again, their syntax has been
changed to be CSS-like
+ More objects use GtkStyleContext directly
+ GtkPlug and GtkSocket have been reduced to X11-specific API,
and using them requires including the <gtk/gtkx.h> header, and
uses of GdkNativeWindow in their APIs have been replaced by the
X11 Window type.
+ Bugs fixed: bgo#351755, bgo#586635, bgo#590459, bgo#598952,
bgo#626336, bgo#634677, bgo#635287, bgo#636691, bgo#638920,
bgo#639139, bgo#639186, bgo#639325, bgo#639380, bgo#639455,
bgo#639520, bgo#639531, bgo#639625, bgo#639750, bgo#639754,
bgo#639767, bgo#639792, bgo#639822, bgo#639845, bgo#639931,
bgo#639949, bgo#640005, bgo#640006, bgo#640011, bgo#640105,
bgo#640161, bgo#640188, bgo#640195, bgo#640282, bgo#640313,
bgo#640391, bgo#640487, bgo#640698, bgo#640712, bgo#640744,
bgo#640902, bgo#640965, bgo#640983, bgo#640999, bgo#641023,
bgo#641039, bgo#641042, bgo#641059, bgo#641073
+ Updated translations.
-------------------------------------------------------------------
Thu Jan 13 08:54:20 CET 2011 - vuntz@opensuse.org

View File

@ -1,4 +1,4 @@
#
# spec file for package gtk3
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
@ -22,7 +22,7 @@
Name: gtk3
%define _name gtk+
Version: 2.99.2
Version: 3.0.0
Release: 1
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 3)
@ -30,7 +30,7 @@ Url: http://www.gtk.org/
Group: System/Libraries
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.90/%{_name}-%{version}.tar.bz2
Source1: README.SUSE
Source2: gtkrc
Source2: settings.ini
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
@ -67,7 +67,7 @@ GTK+ is a multi-platform toolkit for creating graphical user interfaces.
Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
%package -n libgtk-3_0-0
%package -n libgtk-3-0
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 3)
Group: System/Libraries
@ -90,8 +90,12 @@ Recommends: %{name}-lang
Recommends: gvfs
# Provide %{name} to make the lang and immodules packages installable
Provides: %{name} = %{version}
# Before 3.0, the package was actually libgtk-3_0-0 and files might
# conflict
Provides: libgtk-3_0-0 = %{version}
Obsoletes: libgtk-3_0-0 < %{version}
%description -n libgtk-3_0-0
%description -n libgtk-3-0
GTK+ is a multi-platform toolkit for creating graphical user interfaces.
Offering a complete set of widgets, GTK+ is suitable for projects
ranging from small one-off projects to complete application suites.
@ -253,9 +257,7 @@ ranging from small one-off projects to complete application suites.
License: LGPLv2.1+
Summary: The GTK+ toolkit library (version 3) -- Development Files
Group: Development/Libraries/X11
Requires: libgtk-3_0-0 = %{version}
# gtk-builder-convert needs this.
Requires: python-xml
Requires: libgtk-3-0 = %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
@ -294,7 +296,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print
%endif
%find_lang gtk30
%find_lang gtk30-properties
install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/gtkrc
install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
%if "%_lib" == "lib64"
mv %{buildroot}%{_bindir}/gtk-query-immodules-3.0 %{buildroot}%{_bindir}/gtk-query-immodules-3.0-64
@ -306,13 +308,9 @@ mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
# Alternatives for gtk-update-icon-cache and gtk-builder-convert
mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0
mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1
mv %{buildroot}%{_bindir}/gtk-builder-convert %{buildroot}%{_bindir}/gtk-builder-convert-3.0
mv %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 %{buildroot}%{_mandir}/man1/gtk-builder-convert-3.0.1
touch %{buildroot}%{_bindir}/gtk-update-icon-cache
touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1
touch %{buildroot}%{_bindir}/gtk-builder-convert
touch %{buildroot}%{_mandir}/man1/gtk-builder-convert.1
chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-builder-convert
chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
@ -334,10 +332,10 @@ rm -rf %{buildroot}
%endif
%define _gtk_query_immodules_update_cache %{_gtk_query_immodules} --update-cache
%post -n libgtk-3_0-0
%post -n libgtk-3-0
/sbin/ldconfig
%if 0
# In case libgtk-3_0-0 gets installed before gtk3-tools, we don't want to fail.
# In case libgtk-3-0 gets installed before gtk3-tools, we don't want to fail.
# So we make the call to gtk-query-immodules-3.0 dependent on the existence of
# the binary. This is why we also have a %post for gtk3-tools.
%endif
@ -369,7 +367,7 @@ fi
%post tools
%if 0
# If we install gtk3-tools for the first time, then we should run it in case
# libgtk-3_0-0 was installed first (ie, if
# libgtk-3-0 was installed first (ie, if
# %{_libdir}/gtk-3.0/%{gtk_binary_version} already exists) which means
# gtk-query-immodules-3.0 couldn't run there.
%endif
@ -386,14 +384,6 @@ fi
update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 3 \
--slave %{_mandir}/man1/gtk-update-icon-cache.1.gz gtk-update-icon-cache.1.gz %{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz
%post devel
%if 0
# If the gtk-builder-convert group is in automatic mode, then this will also
# switch all symlinks automatically
%endif
update-alternatives --install %{_bindir}/gtk-builder-convert gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0 3 \
--slave %{_mandir}/man1/gtk-builder-convert.1.gz gtk-builder-convert.1.gz %{_mandir}/man1/gtk-builder-convert-3.0.1.gz
%post data
%glib2_gsettings_schema_post
@ -403,7 +393,7 @@ update-alternatives --install %{_bindir}/gtk-builder-convert gtk-builder-convert
# - if it's an uninstall, we don't care about this anymore
%endif
%postun -n libgtk-3_0-0 -p /sbin/ldconfig
%postun -n libgtk-3-0 -p /sbin/ldconfig
%postun immodule-amharic
%{_gtk_query_immodules_update_cache}
@ -437,15 +427,7 @@ if [ ! -f %{_bindir}/gtk-update-icon-cache-3.0 ]; then
update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0
fi
%postun devel
%if 0
# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
%endif
if [ ! -f %{_bindir}/gtk-builder-convert-3.0 ]; then
update-alternatives --remove gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0
fi
%files -n libgtk-3_0-0
%files -n libgtk-3-0
%defattr(-, root, root)
%doc AUTHORS COPYING README NEWS ChangeLog
%if "%_lib" == "lib64"
@ -466,9 +448,9 @@ fi
%ghost %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
%dir %{_libdir}/gtk-3.0/modules
%{_libdir}/gtk-3.0/modules/libgail.so
%{_libdir}/libgailutil-3.0.so.*
%{_libdir}/libgdk-3.0.so.*
%{_libdir}/libgtk-3.0.so.*
%{_libdir}/libgailutil-3.so.*
%{_libdir}/libgdk-3.so.*
%{_libdir}/libgtk-3.so.*
%{_libdir}/girepository-1.0/Gdk-3.0.typelib
%{_libdir}/girepository-1.0/GdkX11-3.0.typelib
%{_libdir}/girepository-1.0/Gtk-3.0.typelib
@ -522,7 +504,7 @@ fi
%files branding-upstream
%defattr(-,root,root)
%config %{_sysconfdir}/gtk-3.0/gtkrc
%config %{_sysconfdir}/gtk-3.0/settings.ini
%files lang -f gtk30.lang -f gtk30-properties.lang
@ -532,10 +514,6 @@ fi
%doc %{_datadir}/gtk-doc/html/gdk3/
%doc %{_datadir}/gtk-doc/html/gtk3/
%{_bindir}/gtk3-demo
%{_bindir}/gtk-builder-convert-3.0
%ghost %{_bindir}/gtk-builder-convert
%{_mandir}/man1/gtk-builder-convert-3.0.1*
%ghost %{_mandir}/man1/gtk-builder-convert.1*
%{_datadir}/aclocal/gtk-3.0.m4
%{_datadir}/gir-1.0/*.gir
%dir %{_datadir}/gtk-3.0
@ -549,9 +527,9 @@ fi
%{_libdir}/pkgconfig/gtk+-3.0.pc
%{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc
%{_libdir}/pkgconfig/gtk+-x11-3.0.pc
%{_libdir}/libgailutil-3.0.so
%{_libdir}/libgdk-3.0.so
%{_libdir}/libgtk-3.0.so
%{_libdir}/libgailutil-3.so
%{_libdir}/libgdk-3.so
%{_libdir}/libgtk-3.so
%{_sysconfdir}/rpm/macros.gtk3
%changelog

11
gtkrc
View File

@ -1,11 +0,0 @@
#
# gtkrc file allows you to define system wide defaults for all GTK+ applications.
# This file is branding specific.
#
# For complete list of available settings see the Resource Files chapter in the
# GTK+ documentation.
#
# You most probably want:
#gtk-theme-name = ""
#gtk-icon-theme-name = ""
#gtk-fallback-icon-theme = "gnome"

13
settings.ini Normal file
View File

@ -0,0 +1,13 @@
#
# settings.ini file allows you to define system wide defaults for
# all GTK+ applications. This file is branding specific.
#
# For complete list of available settings see the Settings chapter
# in the GTK+ documentation.
#
# You most probably want to change the following settings.
[Settings]
#gtk-theme-name =
#gtk-icon-theme-name =
#gtk-fallback-icon-theme = gnome