pool/glib2
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 45060 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/glib2 based on submit request 45060 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/45060
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=87
This commit is contained in:
OBS User autobuild
2010-08-09 13:47:13 +00:00
committed by Git OBS Bridge
parent ed89b43d7c eb4615409a
commit c99601d75e
6 changed files with 319 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
baselibs.conf
View File

@@ -1,4 +1,5 @@
glib2
glib2-tools
+/usr/bin/gio-querymodules(-64)?
libglib-2_0-0
obsoletes "glib2-<targettype> <= <version>"
provides "glib2-<targettype> = <version>"
@@ -6,6 +7,9 @@ libgmodule-2_0-0
libgio-2_0-0
libgthread-2_0-0
libgobject-2_0-0
libgio-fam
post "%{_bindir}/gio-querymodules %{_libdir}/gio/modules"
postun "%{_bindir}/gio-querymodules %{_libdir}/gio/modules"
arch ppc package glib2-devel
arch sparcv9 package glib2-devel

3
glib-2.24.1.tar.bz2
View File

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

3
glib-2.25.13.tar.bz2 Normal file
View File

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

157
glib2.changes
View File

@@ -1,3 +1,160 @@
-------------------------------------------------------------------
Sun Aug 8 04:59:27 CEST 2010 - vuntz@opensuse.org
- Make %glib2_gio_module_post and %glib2_gio_module_postun
functions that can take an optional argument, to specify for
which directory we want to create a module cache. By default,
with no argument, we just use the directory of modules for gio
itself.
-------------------------------------------------------------------
Sat Aug 7 14:14:08 CEST 2010 - vuntz@opensuse.org
- Update to version 2.25.13:
+ The primary purpose of this release is to fix a serious problem
with glib 2.25.12: glibconfig.h (as generated on a Fedora amd64
system) was being distributed in the tarball. It was being
used to build some parts of glib on other systems (eg: 32bit
ones). This was causing some very serious problems.
+ Build and testing:
- vastly improved test coverage
- old tests moved to the gtester framework
- gtester Makefile modified so that the tests only run once
- cleanup of how we handle includes while building glib
+ GVariant:
- add a g_return_if_fail (utf8) to g_variant_new_string()
+ GDBus:
- perform extra sanity checks when serialising messages
- add API to query and set the byteorder of a GDBusMessage
- improve debug output, add some extra options
- if exiting due to the bus disconnecting us, print an error
message explaining why
- sort property names correctly
- don't bother sending RemoveMatch when we will close the
connection anyway
- use effective uid/gid for credential passing
+ GSettings:
- add G_SETTINGS_BIND_INVERT_BOOLEAN for inverting boolean
bindings without mapping functions
- mark all strings in the schema compiler for translation
+ Binding:
- improve closure support for bindings
- copy GSettings INVERT_BOOLEAN flag
+ Other:
- fix another complicated GCancellable deadlock possibility
+ Bugs closed: bgo#599590, bgo#619026, bgo#624739, bgo#625472,
bgo#625500, bgo#625628, bgo#625753, bgo#625827, bgo#625988,
bgo#626107
+ Updated translations.
- Remove workaround for misinstallation of systemtap files: this is
fixed now.
-------------------------------------------------------------------
Fri Jul 30 10:44:08 CEST 2010 - dimstar@opensuse.org
- Update to version 2.25.12:
+ Build:
- cleanup automake setup
- rename configure.in to configure.ac
- various docs fixups
- move glibconfig.h to glib/
- disable dtrace support on Mac OS (which has incompatible
'dtrace')
+ GSettings:
- add support for vendor override files (to change the default
values in a schema)
- change GSettingsBackend vtable
- add g_settings_reset()
- support binding to G_TYPE_STRV properties
+ GDBus:
- many bug fixes, including a serialisation fix
- stop handling incoming connections as soon as stop() is
called
- proper support for file descriptor passing
- new flags parameter for sending messages
- new flags parameter for subscribing to signals
- always reset the message serial when sending a message unless
G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL is given
- constness fixes for introspection structures
- clean ups to subtree registration API
+ Other:
- fix divide by zero bug in g_malloc_n functions
- GIO: don't blindly assume that SOCK_CLOEXEC is supported
- make GObject property notify freezes threadsafe
- GIO: clean up credentials passing
- GApplication: make default-quit not apply if register=FALSE
- GIO: add annotations for gobject-introspection
+ Bugs fixed:
- bgo#166020 use GAtomic for refcounting
- bgo#617483 Credentials passing
- bgo#622005 [GApplication] no way to modify the "default-quit"
property
- bgo#623293 vendor override files
- bgo#623810 Message serialization bug
- bgo#623815 Don't check sender for GDBusProxy objects where
name is not set
- bgo#624473 GDBusSubtreeIntrospectFunc return type
- bgo#624483 GDBusSubtreeEnumerateFunc clarification
- bgo#624484 GDBusSubtreeDispatchFunc clarification
- bgo#624754 gdbusaddress.c missing sys/wait.h
- bgo#624968 div by zero in g_malloc_n family
- bgo#624991 GSettings mapping for G_TYPE_STRV
- bgo#625383 Add missing GI annotations
+ Updated translations.
-------------------------------------------------------------------
Thu Jul 22 14:30:12 CEST 2010 - vuntz@opensuse.org
- Add rpm macros to ease installation of external gio modules and
of gsettings schemas.
- Rename the main package to glib2-tools since it's really what it
contains. Instead, make libglib-2_0-0 provides/obsoletes glib2.
- Make the devel package Requires glib2-tools, since users of the
new rpm macros will need the tools during the build.
- Also do not move the post/postun scriptlets of previous glib2 to
glib2-tools: gio-querymodules needs to be called by packages
installing a module, not by the package containing
gio-querymodules.
- Move glib-compile-schemas from devel package to glib2-tools.
- Add %{_datadir}/glib-2.0/schemas/gschemas.compiled ghost file to
libgio-2_0-0: this is where gsettings schemas will be compiled.
- Add glib2-tools Recommends to libgio-2_0-0, since those tools are
useful when libgio is installed.
-------------------------------------------------------------------
Wed Jul 21 11:22:58 CEST 2010 - vuntz@opensuse.org
- Change pcre-devel BuildRequires to pkgconfig(libpcre).
- Remove checks for old versions of openSUSE (11.0).
- Remove conflicts with gnome-vfs2 < 2.22.0 which is not needed
since openSUSE 11.0.
- Remove workaround that was settings the +x permission on
gtester-report.
- Add systemtap support: add systemtap-sdt-devel BuildRequires,
pass --enable-systemtap to configure and add workaround for
misinstalled tapsets. We also temporary need a python
BuildRequires because of a missing dependency for
systemtap-sdt-devel.
- Use %{?_smp_mflags} instead of %{?jobs:-j%jobs}.
-------------------------------------------------------------------
Wed Jul 14 10:13:33 UTC 2010 - dimstar@opensuse.org
- Update to version 2.25.11:
+ Many changes since 2.24.1. See NEWS for the full list of
changes, the list below is only highlights.
+ Add GSettings API.
+ Add a predefined boxed type for GError.
+ Add support for timeouts in GSocket.
+ Add GDBus API.
+ GVariant now requires strings to be UTF-8.
+ Initial support for dtrace and systemtap profiling.
+ Add GPermission interface.
+ Add GApplication API.
+ Add GBinding API.
+ Deprecate GRelation and GCompletion.
+ Updated translations.
-------------------------------------------------------------------
Thu Jun 3 19:11:32 CEST 2010 - vuntz@opensuse.org

137
glib2.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package glib2 (Version 2.24.1)
# spec file for package glib2 (Version 2.25.13)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,8 +20,11 @@
Name: glib2
%define _name glib
Version: 2.24.1
Release: 2
Version: 2.25.13
Release: 1
# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
# FIXME: remove python BuildRequires once sr#43603 is accepted
# FIXME: find out if tapsets should really be in devel package or in main package
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
@@ -32,9 +35,10 @@ Source2: glib2.csh
Source3: SuSEconfig.glib2
# Not upsteam file. Only proposes upstream packages:
Source4: glib2-upstream-gnome_defaults.conf
Source5: macros.glib2
# Not depending on gtk-doc shortens bootstrap compilation path.
# Please update this file from the latest gtk-doc package:
Source5: gtk-doc.m4
Source6: gtk-doc.m4
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
Patch8: glib2-bnc379332-desktop-su.patch
@@ -45,33 +49,32 @@ Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pcre-devel
BuildRequires: libselinux-devel
BuildRequires: pkg-config
# Only needed because of missing deps in systemtap-sdt-devel, see sr#43603
BuildRequires: python
BuildRequires: systemtap-sdt-devel
BuildRequires: translation-update-upstream
BuildRequires: zlib-devel
%if %suse_version > 1100
BuildRequires: libselinux-devel
%endif
BuildRequires: pkgconfig(libpcre)
# For temporary %%posttrans script only.
PreReq: coreutils
PreReq: /bin/sed
Requires: %{name}-branding
Requires: %{name}-lang = %{version}
# Conflicts with gnome_defaults.conf from gnome-vfs2 in 10.3
Conflicts: gnome-vfs2 < 2.22.0
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
%endif
#
Provides: glib2-doc = 2.19.6
Obsoletes: glib2-doc < 2.19.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package tools
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C -- Tools
Group: Development/Libraries/C and C++
%description tools
This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package branding-upstream
License: LGPLv2.1+
Summary: Definition of GNOME Default Applications
@@ -99,11 +102,14 @@ distribution wise GNOME defaults.
License: GPLv2+
Requires: %{name} = %{version} pkg-config glibc-devel
# Now require the subpackages too
Requires: glib2-tools = %{version}
Requires: libglib-2_0-0 = %{version}
Requires: libgmodule-2_0-0 = %{version}
Requires: libgio-2_0-0 = %{version}
Requires: libgthread-2_0-0 = %{version}
Requires: libgobject-2_0-0 = %{version}
Provides: glib2-doc = 2.19.6
Obsoletes: glib2-doc < 2.19.6
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/C and C++
# bug437293
@@ -124,7 +130,10 @@ hashes, to a C programmer and is used by Gtk+ and GNOME.
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name}-branding = %{version}
Recommends: %{name}-lang = %{version}
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
@@ -153,6 +162,8 @@ to a C programmer and is used by Gtk+ and GNOME.
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
# The tools are useful for people having libgio
Recommends: %{name}-tools
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
@@ -170,8 +181,8 @@ License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
# we need gio-querymodules in %post/%postun
Requires(post): %{name}
Requires(postun): %{name}
Requires(post): %{name}-tools
Requires(postun): %{name}-tools
Supplements: packageand(libgio-2_0-0:fam)
%description -n libgio-fam
@@ -182,7 +193,6 @@ to a C programmer and is used by Gtk+ and GNOME.
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
@@ -217,17 +227,16 @@ translation-update-upstream
cp -a %{S:1} %{S:2} %{S:3} .
cp -a %{S:4} gnome_defaults.conf
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
cp -a %{S:5} m4macros/
cp -a %{S:6} m4macros/
fi
%build
%configure \
--enable-static \
%if %suse_version > 1100
--enable-selinux \
%endif
--with-pcre=system
%{__make} %{?jobs:-j%jobs}
--with-pcre=system \
--enable-systemtap
%{__make} %{?_smp_mflags}
%check
# make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969
@@ -238,6 +247,7 @@ fi
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_lang %{_name}20
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
install -D -m0644 glib2.sh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh
install -D -m0644 glib2.csh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
@@ -247,21 +257,19 @@ install -D -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/gnome_defaul
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0 $RPM_BUILD_ROOT%{_datadir}/applications
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0/defaults.list
ln -s %{_localstatedir}/cache/gio-2.0/defaults.list $RPM_BUILD_ROOT%{_datadir}/applications/defaults.list
# fix some permission issue, but only if needed
test ! -x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
# gio-querymodules magic
%if "%{_lib}" == "lib64"
mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64
%endif
touch $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
# gsettings magic
touch $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
# remove files we don't care about
rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.*a
# We do not need the la files for 11.1 and newer
%if %suse_version > 1100
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%endif
%find_lang %{_name}20
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
%fdupes $RPM_BUILD_ROOT
%posttrans
@@ -278,13 +286,6 @@ if test -f etc/gnome_defaults.conf.rpmsave ; then
mv etc/gnome_defaults.conf.rpmsave etc/gnome_defaults.conf
fi
%post
%if "%{_lib}" == "lib64"
%{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
%else
%{_bindir}/gio-querymodules %{_libdir}/gio/modules
%endif
%post -n libglib-2_0-0 -p /sbin/ldconfig
%post -n libgobject-2_0-0 -p /sbin/ldconfig
@@ -302,9 +303,6 @@ fi
%{_bindir}/gio-querymodules %{_libdir}/gio/modules
%endif
# No %postun about gio-querymodules for the main package since the binary is
# part of this package, and so doesn't exist anymore in %postun
%postun -n libglib-2_0-0 -p /sbin/ldconfig
%postun -n libgobject-2_0-0 -p /sbin/ldconfig
@@ -325,12 +323,23 @@ fi
%clean
rm -rf $RPM_BUILD_ROOT
%files
%files tools
%defattr(-,root,root)
%doc AUTHORS COPYING README NEWS ChangeLog
/etc/profile.d/zzz-glib2.*
/sbin/conf.d/SuSEconfig.glib2
%{_sysconfdir}/bash_completion.d/gdbus-bash-completion.sh
%{_sysconfdir}/bash_completion.d/gsettings-bash-completion.sh
%{_bindir}/gdbus
%{_bindir}/gio-querymodules*
%{_bindir}/glib-compile-schemas
%{_bindir}/gsettings
%{_mandir}/man1/gdbus.1*
%{_mandir}/man1/gio-querymodules.1*
%{_mandir}/man1/glib-compile-schemas.1*
%{_mandir}/man1/gsettings.1*
# We put those files here, but they don't really belong here. They just don't
# have a better home... The zzz-glib2 scripts could arguably be in
# libglib-2_0-0 but that would break the shared library policy.
%{_sysconfdir}/profile.d/zzz-glib2.*
/sbin/conf.d/SuSEconfig.glib2
%files branding-upstream
%defattr(-,root,root)
@@ -338,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libglib-2_0-0
%defattr(-, root, root)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_libdir}/libglib*.so.*
%files -n libgmodule-2_0-0
@@ -358,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/gio
%dir %{_libdir}/gio/modules
%ghost %{_libdir}/gio/modules/giomodule.cache
%dir %{_datadir}/glib-2.0/
%dir %{_datadir}/glib-2.0/schemas/
%ghost %{_datadir}/glib-2.0/schemas/gschemas.compiled
%{_datadir}/applications/defaults.list
%dir %{_localstatedir}/cache/gio-2.0
%ghost %{_localstatedir}/cache/gio-2.0/defaults.list
@@ -370,24 +383,36 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root)
%{_bindir}/glib-*
%{_bindir}/gobject-*
%{_bindir}/gtester*
%doc %{_mandir}/man?/glib-*.*
%doc %{_mandir}/man?/gobject-*.*
%doc %{_mandir}/man?/gtester*.*
%{_bindir}/glib-genmarshal
%{_bindir}/glib-gettextize
%{_bindir}/glib-mkenums
%{_bindir}/gobject-query
%{_bindir}/gtester
%{_bindir}/gtester-report
%doc %{_mandir}/man?/glib-genmarshal.*
%doc %{_mandir}/man?/glib-gettextize.*
%doc %{_mandir}/man?/glib-mkenums.*
%doc %{_mandir}/man?/gobject-query.*
%doc %{_mandir}/man?/gtester.*
%doc %{_mandir}/man?/gtester-report.*
%{_datadir}/aclocal/*.m4
%{_datadir}/glib-2.0
%dir %{_datadir}/glib-2.0/
%{_datadir}/glib-2.0/gdb/
%{_datadir}/glib-2.0/gettext/
%{_datadir}/glib-2.0/schemas/gschema.dtd
%{_includedir}/glib-2.0
%{_includedir}/gio-unix-2.0
%{_libdir}/lib*.so
%{_libdir}/lib*.*a
%{_libdir}/glib-2.0
%dir %{_libdir}/glib-2.0/
%{_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/%{_libdir}/*-gdb.py
%{_datadir}/systemtap/tapset/*.stp
%{_sysconfdir}/rpm/macros.glib2
# Own these directories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html

73
macros.glib2 Normal file
View File

@@ -0,0 +1,73 @@
# RPM macros for packages installing a GSettings schema or GIO module
#
###
#
# When a package installs a GSettings schemas, it should use all
# three macros:
#
# - %glib2_gsettings_schema_requires in the preamble
# - %glib2_gsettings_schema_post in %post
# - %glib2_gsettings_schema_postun in %postun
#
###
#
# When a package installs a GIO module, it should use all
# three macros:
#
# - %glib2_gio_module_requires in the preamble
# - %glib2_gio_module_post in %post
# - %glib2_gio_module_postun in %postun
#
# Note that %glib2_gio_module_post and %glib2_gio_module_postun can
# optionally take the path to the directory where modules live. This
# is useful for applications using the GIO module system on their own,
# since they will install modules in their own directory. If no
# argument is passed, the path for the modules for GIO itself is used.
#
###
%glib2_gsettings_schema_requires \
Requires(post): glib2-tools \
Requires(postun): glib2-tools
%glib2_gsettings_schema_post \
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas
# Note: we ignore upgrades (already handled in %post of the new package).
%glib2_gsettings_schema_postun \
if [ $1 -eq 0 ]; then \
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas \
fi
%glib2_gio_module_requires \
Requires(post): glib2-tools \
Requires(postun): glib2-tools
# On install, update the cache
%glib2_gio_module_post() \
%if "x%1" != "x%%1" \
GIO_MODULES_DIR="%1" \
%else \
GIO_MODULES_DIR="%{_libdir}/gio/modules" \
%endif \
%if "%{_lib}" == "lib64" \
%{_bindir}/gio-querymodules-64 "${GIO_MODULES_DIR}" \
%else \
%{_bindir}/gio-querymodules "{$GIO_MODULES_DIR}" \
%endif
# On uninstall, update the cache. Note: we ignore upgrades (already
# handled in %post of the new package).
%glib2_gio_module_postun() \
if [ $1 -eq 0 ]; then \
%if "x%1" != "x%%1" \
GIO_MODULES_DIR="%1" \
%else \
GIO_MODULES_DIR="%{_libdir}/gio/modules" \
%endif \
%if "%_lib" == "lib64" \
%{_bindir}/gio-querymodules-64 "${GIO_MODULES_DIR}" \
%else \
%{_bindir}/gio-querymodules "${GIO_MODULES_DIR}" \
%endif \
fi