Accepting request 75731 from GNOME:Factory
Pushing G:F, including GNOME 3.1.3 OBS-URL: https://build.opensuse.org/request/show/75731 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=112
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
5936227892
19
README.Gsettings-overrides
Normal file
19
README.Gsettings-overrides
Normal file
@ -0,0 +1,19 @@
|
||||
Quoting the "Vendor overrides" section from [1]:
|
||||
|
||||
Default values are defined in the schemas that get installed by an application.
|
||||
Sometimes, it is necessary for a vendor or distributor to adjust these
|
||||
defaults. Since patching the XML source for the schema is inconvenient and
|
||||
error-prone, glib-compile-schemas reads so-called 'vendor override' files.
|
||||
These are keyfiles in the same directory as the XML schema sources which can
|
||||
override default values. The schema id serves as the group name in the key
|
||||
file, and the values are expected in serialized GVariant form, as in the
|
||||
following example:
|
||||
|
||||
[org.gtk.Example]
|
||||
key1='string'
|
||||
key2=1.5
|
||||
|
||||
glib-compile-schemas expects schema files to have the extension
|
||||
.gschema.override
|
||||
|
||||
[1] http://developer.gnome.org/gio/stable/GSettings.html
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f
|
||||
size 7017806
|
||||
3
glib-2.29.10.tar.bz2
Normal file
3
glib-2.29.10.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:81eabdc56ac8a64900e798805f35655395f20f5155b57b42f577311ee45234bb
|
||||
size 7466350
|
||||
167
glib2.changes
167
glib2.changes
@ -1,3 +1,170 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 22:09:00 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- Rename glib2-branding-upstream subpackage to
|
||||
gio-branding-upstream:
|
||||
+ we do this since the data we add here is related only to gio,
|
||||
not to the whole glib.
|
||||
+ add appropriate Provides/Obsoletes for glib2-branding-upstream
|
||||
to gio-branding-upstream for smooth upgrades.
|
||||
+ change the branding-related Provides/Conflicts/Supplements to
|
||||
be about gio.
|
||||
+ add libgio-2_0-0 Requires to branding subpackage, since the
|
||||
branding package is useless without the library.
|
||||
+ remove glib2-branding Requires from libglib-2_0-0.
|
||||
+ add gio-branding Requires to libgio-2_0-0.
|
||||
+ make branding subpackage noarch.
|
||||
+ update summary and description of the branding subpackage.
|
||||
- Add a README.Gsettings-overrides file, packaged in
|
||||
gio-branding-upstream to explain how to use overrides for
|
||||
GSettings. This might help people creating other branding
|
||||
packages.
|
||||
- Add gio Provides to libgio-2_0-0, to make branding packaging
|
||||
easier.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 6 00:31:06 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.29.10:
|
||||
+ New features:
|
||||
- g_desktop_app_info_get_nodisplay: a function that is required
|
||||
to port gnome-menus to GDesktopAppInfo
|
||||
- g_hash_table_iter_replace: new function to replace a value
|
||||
while iterating over a hash table
|
||||
- g_utf8_substring: convenience API to extract substrings from
|
||||
UTF-8 strings
|
||||
- g_action_group_add_entries: convenience API for creating lots
|
||||
of actions quickly
|
||||
- Use eventfd instead of pipes for waking up main contexts and
|
||||
for cancellation when available
|
||||
- GMatchInfo is now a refcounted boxed type
|
||||
+ API changes in GAction:
|
||||
- the 'set_state' entry in the GActionInterface vtable has been
|
||||
renamed to 'change_state
|
||||
- g_action_set_state has been renamed to g_action_change_state
|
||||
- the 'state' property has been changed to read-only
|
||||
- GSimpleAction can no longer be subclassed
|
||||
+ Bug fixes: bgo#647796, bgo#652072, bgo#652168, bgo#652750,
|
||||
bgo#652758, bgo#652822, bgo#652897, bgo#653140, bgo#653429,
|
||||
bgo#653484.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 16 12:27:47 UTC 2011 - dimstar@opensuse.org
|
||||
|
||||
- No longer pass --with-runtime-libdir= to configure. This moves
|
||||
the library back to /usr/lib(64)?, from /lib(64)?. There is
|
||||
agreement that we do not want to keep moving all libraries in
|
||||
/lib(64)?, and since libffi was not moved, there's no point in
|
||||
pretending the glib libraries should move too. See bnc#696004 for
|
||||
more details.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 14 22:24:44 CEST 2011 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.29.8:
|
||||
+ Fix a deadlock in gobject finalization
|
||||
+ Bugs fixed: bgo#646608, bgo#646635, bgo#647930, bgo#651745,
|
||||
bgo#651920, bgo#651959, bgo#651998, bgo#652000, bgo#652002,
|
||||
bgo#652025, bgo#652081, bgo#652197.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 8 14:43:20 CEST 2011 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.29.6:
|
||||
+ Atomic operations have been rewritten from scratch to make use
|
||||
of gcc builtins where possible.
|
||||
+ A full set of atomic operations on pointers has been added,
|
||||
including bit locks in pointer-size locations.
|
||||
+ Access to quarks is now lockless
|
||||
+ GObject data scalability has been greatly improved
|
||||
+ g_data_time_format now supports alternative digits and padding
|
||||
+ Introspection improvements:
|
||||
- Add a boxed type for GVariantBuilder
|
||||
- Annotation fixes in GDBus, GVariant, g_base64_
|
||||
+ Bugs fixed: bgo#502560, bgo#612729, bgo#617491, bgo#619418,
|
||||
bgo#619435, bgo#626549, bgo#631231, bgo#632294, bgo#640518,
|
||||
bgo#642026, bgo#646635, bgo#648678, bgo#649480, bgo#649506,
|
||||
bgo#649657, bgo#649775, bgo#649915, bgo#649973, bgo#649988,
|
||||
bgo#650078, bgo#650211, bgo#650236, bgo#650345, bgo#650458,
|
||||
bgo#650459, bgo#650688, bgo#650823, bgo#650874, bgo#650882,
|
||||
bgo#650884, bgo#650885, bgo#650935, bgo#651009, bgo#651034,
|
||||
bgo#651133, bgo#651141, bgo#651219, bgo#651223, bgo#651327,
|
||||
bgo#651467, bgo#651650, bgo#651725, bgo#651745.
|
||||
+ Updated translations.
|
||||
- Add python-xml Requires in devel subpackage as it is needed by
|
||||
gdbus-codegen, and also add python-xml BuildRequires since
|
||||
gdbus-codegen is run during the build.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 8 10:18:54 CEST 2011 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.29.4:
|
||||
+ GDBus:
|
||||
- Includes several new types to support modeling D-Bus
|
||||
objects and interfaces more fully, and also introduces
|
||||
an 'object manager' pattern
|
||||
- The new gdbus-codegen utility uses these new classes
|
||||
to generate C code and documentation from D-Bus interface
|
||||
descriptions in XML
|
||||
+ GTest:
|
||||
- There is now a g_test_fail() function to mark tests as failed
|
||||
+ GDesktopAppInfo
|
||||
- Now has a binding-friendly filename property
|
||||
- Other new API to more fully expose desktop file contents:
|
||||
. g_desktop_app_info_get_categories(),
|
||||
. g_desktop_app_info_get_generic_name()
|
||||
+ GHashTable:
|
||||
- Several optimizations to reduce space consumption of
|
||||
large hash tables, in particular tables that are used
|
||||
to store sets.
|
||||
+ Unix-specific APIs:
|
||||
- GLib now installs a separate header, glib-unix.h, that is
|
||||
meant to collect Unix-specific APIs
|
||||
+ Bugs fixed: bgo#631379, bgo#632631, bgo#635694, bgo#637561,
|
||||
bgo#642935, bgo#643134, bgo#644941, bgo#646013, bgo#646309,
|
||||
bgo#646435, bgo#646957, bgo#647594, bgo#647602, bgo#647746,
|
||||
bgo#647826, bgo#647903, bgo#648416, bgo#648423, bgo#648425,
|
||||
bgo#648966.
|
||||
- Changes from version 2.29.2:
|
||||
+ GApplication
|
||||
- The documentation has been enhanced and clarified
|
||||
- An opt-out for uniqueness has been added:
|
||||
. G_APPLICATION_NON_UNIQUE
|
||||
- GApplication now syncs settings before g_application_run()
|
||||
returns
|
||||
+ GDBus
|
||||
- Interface lookups are now happening in constant time
|
||||
- Signature checking and handling of various unexpected
|
||||
situations has been improved
|
||||
+ GVariant
|
||||
- The format accepted by the GVariant parser has beend
|
||||
documented
|
||||
- GVariant accepts G_VARIANT_TYPE_VARDICT for a{sv}
|
||||
+ GDateTime:
|
||||
- The return value of g_datetime_compare() has been fixed to
|
||||
match strcmp() semantics
|
||||
- In order to handle problems with changing timezones, a
|
||||
GTimeZoneMonitor has been added to GIO, and
|
||||
g_time_zone_refresh_local() can be called to update the
|
||||
cached information about the local timezone
|
||||
+ GOption now uses /proc/self/cmdline to set the program name
|
||||
instead and only falls back to "<unknown>" if that is
|
||||
unavailable
|
||||
+ GSettings:
|
||||
- The schema compiler now warns about references to
|
||||
non-existing schemas
|
||||
+ Bugs fixed: bgo#613269, bgo#624943, bgo#637738, bgo#638185,
|
||||
bgo#639478, bgo#641755, bgo#641768, bgo#642797, bgo#642825,
|
||||
bgo#642944, bgo#643074, bgo#643197, bgo#643468, bgo#643478,
|
||||
bgo#643624, bgo#643649, bgo#643780, bgo#643795, bgo#644309,
|
||||
bgo#644428, bgo#644465, bgo#644552, bgo#644607, bgo#645789,
|
||||
bgo#646039, bgo#646310, bgo#646420, bgo#646843, bgo#646985,
|
||||
bgo#647579, bgo#647600
|
||||
+ Updated translations.
|
||||
- Add python and pkgconfig(libffi) BuildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 7 13:03:52 UTC 2011 - fcrozat@novell.com
|
||||
|
||||
|
||||
84
glib2.spec
84
glib2.spec
@ -21,7 +21,7 @@
|
||||
|
||||
Name: glib2
|
||||
%define _name glib
|
||||
Version: 2.28.8
|
||||
Version: 2.29.10
|
||||
Release: 1
|
||||
# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
|
||||
# FIXME: find out if tapsets should really be in devel package or in main package
|
||||
@ -29,16 +29,18 @@ License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library
|
||||
Url: http://www.gtk.org/
|
||||
Group: System/Libraries
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
|
||||
Source: http://download.gnome.org/sources/glib/2.29/%{_name}-%{version}.tar.bz2
|
||||
Source1: glib2.sh
|
||||
Source2: glib2.csh
|
||||
Source3: SuSEconfig.glib2
|
||||
# Not upsteam file. Only proposes upstream packages:
|
||||
# Not upstream file. Only proposes upstream packages:
|
||||
Source4: glib2-upstream-gnome_defaults.conf
|
||||
Source5: macros.glib2
|
||||
# Some documentation for people writing branding packages, shipped in the branding-upstream package
|
||||
Source5: README.Gsettings-overrides
|
||||
Source6: macros.glib2
|
||||
# Not depending on gtk-doc shortens bootstrap compilation path.
|
||||
# Please update this file from the latest gtk-doc package:
|
||||
Source6: gtk-doc.m4
|
||||
Source7: gtk-doc.m4
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE glib2-use-old-pcre.patch vuntz@opensuse.org -- Do no require a too recent version of pcre on openSUSE versions that don't have it
|
||||
Patch0: glib2-use-old-pcre.patch
|
||||
@ -55,6 +57,9 @@ BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python
|
||||
# gdbus-codegen is run during the build, so we need python-xml
|
||||
BuildRequires: python-xml
|
||||
%if 0%{?with_systemtap}
|
||||
# systemtap-sdt-devel on openSUSE 11.3 was missing a Requires: python.
|
||||
%if %{?suse_version} <= 1130
|
||||
@ -64,6 +69,7 @@ BuildRequires: systemtap-sdt-devel
|
||||
%endif
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
BuildRequires: pkgconfig(libpcre)
|
||||
%if 0%{?BUILD_FROM_VCS}
|
||||
# It's important to keep those BuildRequires inside
|
||||
@ -91,27 +97,31 @@ 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 branding-upstream
|
||||
%package -n gio-branding-upstream
|
||||
License: LGPLv2+
|
||||
Summary: Definition of GNOME Default Applications
|
||||
Summary: Upstream definitions of default settings and applications
|
||||
Group: System/Libraries
|
||||
Provides: %{name}-branding = %{version}
|
||||
Conflicts: otherproviders(%{name}-branding)
|
||||
Supplements: packageand(%{name}:branding-upstream)
|
||||
Requires: libgio-2_0-0 = %{version}
|
||||
Provides: %{name}-branding-upstream = %{version}
|
||||
Obsoletes: %{name}-branding-upstream < %{version}
|
||||
Provides: gio-branding = %{version}
|
||||
Conflicts: otherproviders(gio-branding)
|
||||
Supplements: packageand(libgio-2_0-0:branding-upstream)
|
||||
BuildArch: noarch
|
||||
#BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
|
||||
#BRAND: applications as preferred defaults.
|
||||
#BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override file can
|
||||
#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
|
||||
# enhancement, but to conform branding conventions, the package is named
|
||||
# as glib2-branding-upstream.
|
||||
# as gio-branding-upstream.
|
||||
|
||||
%description branding-upstream
|
||||
This branding-style package sets default applications in GNOME in
|
||||
openSUSE.
|
||||
|
||||
This is a dumb package, which provides only upstream GNOME packages as
|
||||
preferred defaults. You most probably don't want this package. You
|
||||
probably want to install distribution default glib2-branding and prefer
|
||||
distribution wise GNOME defaults.
|
||||
%description -n gio-branding-upstream
|
||||
This package provides upstream defaults for settings stored with
|
||||
GSettings and applications used by the MIME system.
|
||||
|
||||
%package devel
|
||||
#'
|
||||
@ -124,6 +134,8 @@ Requires: libgmodule-2_0-0 = %{version}
|
||||
Requires: libgio-2_0-0 = %{version}
|
||||
Requires: libgthread-2_0-0 = %{version}
|
||||
Requires: libgobject-2_0-0 = %{version}
|
||||
# Required by gdbus-codegen
|
||||
Requires: python-xml
|
||||
Provides: glib2-doc = 2.19.6
|
||||
Obsoletes: glib2-doc < 2.19.6
|
||||
Summary: General-Purpose Utility Library -- Development Files
|
||||
@ -158,7 +170,6 @@ This package contains static versions of the GLib libraries.
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-branding = %{version}
|
||||
Recommends: %{name}-lang
|
||||
Provides: %{name} = %{version}
|
||||
Obsoletes: %{name} < %{version}
|
||||
@ -190,10 +201,13 @@ object files (commonly known as 'plug-ins').
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Library for VFS
|
||||
Group: System/Libraries
|
||||
Requires: gio-branding = %{version}
|
||||
# bnc#555605: shared-mime-info is required by libgio to properly detect mime types.
|
||||
Requires: shared-mime-info
|
||||
# The tools are useful for people having libgio
|
||||
Recommends: %{name}-tools
|
||||
# Needed for branding packages
|
||||
Provides: gio = %{version}
|
||||
# Temporarily disable this, pending further discussion
|
||||
# Recommends: gvfs
|
||||
|
||||
@ -256,10 +270,10 @@ translation-update-upstream
|
||||
%patch10 -p1
|
||||
%patch11 -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
|
||||
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
|
||||
cp -a %{S:6} m4macros/
|
||||
cp -a %{S:7} m4macros/
|
||||
fi
|
||||
%if 0%{?BUILD_FROM_VCS}
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
@ -274,11 +288,10 @@ autoreconf -fi -I m4macros
|
||||
%configure \
|
||||
--enable-static \
|
||||
--enable-selinux \
|
||||
--with-pcre=system \
|
||||
%if 0%{?with_systemtap}
|
||||
--enable-systemtap \
|
||||
%endif
|
||||
--with-runtime-libdir=../../%{_lib}
|
||||
--with-pcre=system
|
||||
|
||||
%{__make} %{?_smp_mflags} V=1
|
||||
%if 0%{?BUILD_FROM_VCS}
|
||||
@ -316,7 +329,7 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
||||
rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
|
||||
# Install rpm macros
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
|
||||
cp %{S:6} %{buildroot}%{_sysconfdir}/rpm
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%posttrans
|
||||
@ -398,30 +411,31 @@ rm -rf %{buildroot}
|
||||
%{_sysconfdir}/profile.d/zzz-glib2.*
|
||||
/sbin/conf.d/SuSEconfig.glib2
|
||||
|
||||
%files branding-upstream
|
||||
%files -n gio-branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%doc README.Gsettings-overrides
|
||||
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
|
||||
|
||||
%files -n libglib-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS COPYING README NEWS ChangeLog
|
||||
/%{_lib}/libglib*.so.*
|
||||
%{_libdir}/libglib*.so.*
|
||||
|
||||
%files -n libgmodule-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgmodule*.so.*
|
||||
%{_libdir}/libgmodule*.so.*
|
||||
|
||||
%files -n libgobject-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgobject*.so.*
|
||||
%{_libdir}/libgobject*.so.*
|
||||
|
||||
%files -n libgthread-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgthread*.so.*
|
||||
%{_libdir}/libgthread*.so.*
|
||||
|
||||
%files -n libgio-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgio*.so.*
|
||||
%{_libdir}/libgio*.so.*
|
||||
%dir %{_libdir}/gio
|
||||
%dir %{_libdir}/gio/modules
|
||||
%ghost %{_libdir}/gio/modules/giomodule.cache
|
||||
@ -440,12 +454,14 @@ rm -rf %{buildroot}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gdbus-codegen
|
||||
%{_bindir}/glib-genmarshal
|
||||
%{_bindir}/glib-gettextize
|
||||
%{_bindir}/glib-mkenums
|
||||
%{_bindir}/gobject-query
|
||||
%{_bindir}/gtester
|
||||
%{_bindir}/gtester-report
|
||||
%doc %{_mandir}/man?/gdbus-codegen.*
|
||||
%doc %{_mandir}/man?/glib-genmarshal.*
|
||||
%doc %{_mandir}/man?/glib-gettextize.*
|
||||
%doc %{_mandir}/man?/glib-mkenums.*
|
||||
@ -461,12 +477,13 @@ rm -rf %{buildroot}
|
||||
%{_includedir}/gio-unix-2.0
|
||||
%{_libdir}/lib*.so
|
||||
%dir %{_libdir}/glib-2.0/
|
||||
%{_libdir}/gdbus-codegen/
|
||||
%{_libdir}/glib-2.0/include/
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_datadir}/gtk-doc/html/gio
|
||||
%{_datadir}/gtk-doc/html/glib
|
||||
%{_datadir}/gtk-doc/html/gobject
|
||||
%{_datadir}/gdb/auto-load/%{_lib}/*-gdb.py
|
||||
%{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
|
||||
%if 0%{?with_systemtap}
|
||||
%{_datadir}/systemtap/tapset/*.stp
|
||||
%endif
|
||||
@ -477,7 +494,8 @@ rm -rf %{buildroot}
|
||||
# Own these directories to not depend on gdb
|
||||
%dir %{_datadir}/gdb
|
||||
%dir %{_datadir}/gdb/auto-load
|
||||
%dir %{_datadir}/gdb/auto-load/%{_lib}
|
||||
%dir %{_datadir}/gdb/auto-load%{_prefix}
|
||||
%dir %{_datadir}/gdb/auto-load%{_libdir}
|
||||
|
||||
%files devel-static
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user