pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/glib2 revision 75.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=8862a3bde702f3f2309000d1f5859489
This commit is contained in:
OBS User buildservice-autocommit 2009-12-08 09:34:05 +00:00 committed by Git OBS Bridge
parent c0ac571ebc
commit 28bcdc300a
6 changed files with 116 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.22.1.tar.bz2
View File

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

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

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

13
glib2-aclocal.patch
View File

@ -1,13 +0,0 @@
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -3,6 +3,8 @@ include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4macros
+
SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
DIST_SUBDIRS = $(SUBDIRS) build

74
glib2-mkinstalldirs.patch
View File

@ -1,74 +0,0 @@
Index: m4macros/glib-gettext.m4
===================================================================
--- m4macros/glib-gettext.m4.orig
+++ m4macros/glib-gettext.m4
@@ -354,18 +354,6 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
fi
fi
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in.orig
+++ po/Makefile.in.in
@@ -35,7 +35,6 @@ subdir = po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
CC = @CC@
GENCAT = @GENCAT@
@@ -120,11 +119,7 @@ install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
+ @mkdir_p@ $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
@@ -134,11 +129,7 @@ install-data-yes: all
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
- fi; \
+ @mkdir_p@ $$dir; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
@@ -162,11 +153,7 @@ install-data-yes: all
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
+ @mkdir_p@ $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \

78
glib2.changes
View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Wed Dec 2 12:14:47 CET 2009 - vuntz@opensuse.org
- Update to version 2.23.0:
+ GIO:
- GConverter: a generic interface for stateful conversions of
data, suitable for charset conversion, compression,
decompression, regexp replacement. Concrete implementations
are GCharsetConverter, GZlibCompressor and GZlibDecompressor.
GConverterInputStream, GConverterOutputStream are stream
implementations that convert data while loading or saving it.
- GMounts can now have a 'default location': a path that
reflects the main entry point for the user (e.g. the home
directory).
- As a consequence of the compression support, GIO depends on
zlib now.
+ GObject:
- G_IMPLEMENT_INTERFACE_DYNAMIC: a convenience macro for adding
interfaces to dynamic types.
+ GModule:
- The -pthread flag has been added to all gmodule .pc files,
because it is not generally permissible to load modules that
are linked against libpthread if the program has not been
compiled with threading support.
+ Bugs fixed:
- bgo#601637: GUnixFDMessage should contain a GUnixFDList
- bgo#585566: GSocketListener API issues
- bgo#572252: Bug in g_file_test() function.
- bgo#600550: g_app_info_create_from_commandline doesn't treat
arguments properly
- bgo#541236: not detecting exact content type
- bgo#350200: [PATCH] GTypeModule derived class unref does not
unload plugin
- bgo#589631: Please enclose literal values with double quotes
- bgo#577711: cross compile check for g++ broken
- bgo#600620: Support X-GNOME-FullName in GAppInfo
- bgo#598899: GWin32DirectoryMonitor is broken
- bgo#593809: Nautilus does not restore the position of the
icons on the desktop...
- bgo#563627: g_get_prgname() threadsafety
- bgo#600141: Add -pthread to gmodule pkg-config
- bgo#593856: file and directory monitors don't work when glib
is compiled...
- bgo#324930: Nautilus should disallow copying of symlink to
FAT drive early
- bgo#587300: Deadlock when calling g_cancellable_disconnect in
a...
- bgo#595138: GFile not robust with invalid input
- bgo#591216: Warning building resolver.o
- bgo#590016: Does not compile under MinGW32 + Wine
- bgo#591214: Warnings building gcancellable.o
- bgo#561998: Have specific entry points (paths) for mounts...
- bgo#508157: Add G_IMPLEMENT_INTERFACE_DYNAMIC
- bgo#535159: g_file_has_parent
+ Updated translations.
- Add zlib-devel BuildRequires.
- Remove AutoReqProv: it's default now.
- Fix self-obsoletion with glib2-doc.
- Drop glib2-mkinstalldirs.patch: I have no idea why this patch has
been there forever, but I don't think it's needed. This also
enables us to remove the autoreconf call.
- Drop glib2-aclocal.patch: this is actually unneeded, since
acinclude.m4 contains what's needed.
-------------------------------------------------------------------
Fri Nov 13 17:43:50 CET 2009 - vuntz@opensuse.org
- Update to version 2.22.2:
+ GIO:
- Support case-sensitive globs in the shared mime database,
including support for the newer cache format that allows
these.
+ GObject:
- Speed up creation of simple objects
+ Bugs fixed:
- bgo#597194: Typo in _G_TYPE_CVH macro
+ Updated translations.
-------------------------------------------------------------------
Tue Oct 27 17:27:47 CET 2009 - sbrabec@suse.cz

75
glib2.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package glib2 (Version 2.22.1)
# spec file for package glib2 (Version 2.23.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,27 +20,12 @@
Name: glib2
%define _name glib
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: translation-update-upstream
%if %suse_version > 1100
BuildRequires: libselinux-devel
%endif
License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: on
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
%endif
#
Version: 2.22.1
Release: 2
Version: 2.23.0
Release: 1
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
Group: Development/Libraries/C and C++
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
Source1: glib2.sh
Source2: glib2.csh
@ -50,33 +35,44 @@ Source4: glib2-upstream-gnome_defaults.conf
# Not depending on gtk-doc shortens bootstrap compilation path.
# Please update this file from the latest gtk-doc package:
Source5: gtk-doc.m4
# PATCH-FIX-OPENSUSE glib2-mkinstalldirs.patch
Patch0: glib2-mkinstalldirs.patch
# PATCH-FIX-OPENSUSE glib2-aclocal.patch
Patch1: glib2-aclocal.patch
# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
Patch8: glib2-bnc379332-desktop-su.patch
# PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
Patch10: glib2-bgo569829-gettext-gkeyfile.patch
# PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations)
Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: translation-update-upstream
BuildRequires: zlib-devel
%if %suse_version > 1100
BuildRequires: libselinux-devel
%endif
# For temporary %%pre 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
Requires: %{name}-branding
Obsoletes: glib2-doc <= 2.19.6
# 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 branding-upstream
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: Definition of GNOME Default Applications
Group: Development/Libraries/C and C++
Provides: %{name}-branding = %{version}
@ -99,7 +95,7 @@ distribution wise GNOME defaults.
%package devel
#'
License: GPL v2 or later
License: GPLv2+
Requires: %{name} = %{version} pkg-config glibc-devel
# Now require the subpackages too
Requires: libglib-2_0-0 = %{version}
@ -109,7 +105,6 @@ Requires: libgthread-2_0-0 = %{version}
Requires: libgobject-2_0-0 = %{version}
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/C and C++
AutoReqProv: on
# bug437293
%ifarch ppc64
Obsoletes: glib2-devel-64bit
@ -125,7 +120,7 @@ The glib library provides convenient functions, such as lists and
hashes, to a C programmer and is used by Gtk+ and GNOME.
%package -n libglib-2_0-0
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@ -140,7 +135,7 @@ This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package -n libgmodule-2_0-0
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@ -155,7 +150,7 @@ This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package -n libgio-2_0-0
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@ -172,7 +167,7 @@ This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package -n libgio-fam
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Supplements: packageand(libgio-2_0-0:fam)
@ -182,7 +177,7 @@ This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package -n libgthread-2_0-0
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@ -197,7 +192,7 @@ This library provides convenient functions, such as lists and hashes,
to a C programmer and is used by Gtk+ and GNOME.
%package -n libgobject-2_0-0
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: A Library with Convenient Functions Written in C
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@ -215,8 +210,6 @@ to a C programmer and is used by Gtk+ and GNOME.
%prep
%setup -q -n %{_name}-%{version}
translation-update-upstream
%patch0
%patch1
%patch8
%patch10 -p1
%patch11 -p1
@ -227,7 +220,6 @@ if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
fi
%build
autoreconf -fiv
%configure \
--enable-static \
%if %suse_version > 1100
@ -242,6 +234,9 @@ autoreconf -fiv
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
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