From 9b3b0121963462f7d4800670365a237698852cd4d9b025c135bd85a48cdfa334 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 27 Oct 2009 16:28:14 +0000 Subject: [PATCH 1/7] - Added support for translation-update-upstream (FATE#301344). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=56 --- glib2.changes | 5 +++++ glib2.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/glib2.changes b/glib2.changes index 7dbfbff..2a48b0c 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 27 17:27:47 CET 2009 - sbrabec@suse.cz + +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Wed Sep 30 10:17:15 CEST 2009 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index b4196d2..b55236d 100644 --- a/glib2.spec +++ b/glib2.spec @@ -25,6 +25,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: translation-update-upstream %if %suse_version > 1100 BuildRequires: libselinux-devel %endif @@ -213,6 +214,7 @@ to a C programmer and is used by Gtk+ and GNOME. %lang_package %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 %patch8 From 3b40ae96474a9cbc101de1ccedda25ba957fc000afa38f791d86a6f9263e3709 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 30 Oct 2009 15:55:28 +0000 Subject: [PATCH 2/7] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=57 --- glib2.changes | 5 ----- glib2.spec | 2 -- 2 files changed, 7 deletions(-) diff --git a/glib2.changes b/glib2.changes index 2a48b0c..7dbfbff 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 27 17:27:47 CET 2009 - sbrabec@suse.cz - -- Added support for translation-update-upstream (FATE#301344). - ------------------------------------------------------------------- Wed Sep 30 10:17:15 CEST 2009 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index b55236d..b4196d2 100644 --- a/glib2.spec +++ b/glib2.spec @@ -25,7 +25,6 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pcre-devel BuildRequires: pkg-config -BuildRequires: translation-update-upstream %if %suse_version > 1100 BuildRequires: libselinux-devel %endif @@ -214,7 +213,6 @@ to a C programmer and is used by Gtk+ and GNOME. %lang_package %prep %setup -q -n %{_name}-%{version} -translation-update-upstream %patch0 %patch1 %patch8 From dc1670c23e1c7e56a9c50fb00b70bd98b6d17108eecdbf90ee34cd909c388138 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 24 Nov 2009 20:54:56 +0000 Subject: [PATCH 3/7] Accepting request 24309 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 24309 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/24309 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=58 --- glib-2.22.1.tar.bz2 | 3 --- glib-2.22.2.tar.bz2 | 3 +++ glib2.changes | 19 +++++++++++++++++++ glib2.spec | 6 ++++-- 4 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 glib-2.22.1.tar.bz2 create mode 100644 glib-2.22.2.tar.bz2 diff --git a/glib-2.22.1.tar.bz2 b/glib-2.22.1.tar.bz2 deleted file mode 100644 index 5de8db8..0000000 --- a/glib-2.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d -size 5476114 diff --git a/glib-2.22.2.tar.bz2 b/glib-2.22.2.tar.bz2 new file mode 100644 index 0000000..92d1830 --- /dev/null +++ b/glib-2.22.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3 +size 5490926 diff --git a/glib2.changes b/glib2.changes index 7dbfbff..d6bf8a2 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +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 + +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Wed Sep 30 10:17:15 CEST 2009 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index b4196d2..2d8af59 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.22.1) +# spec file for package glib2 (Version 2.22.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,6 +25,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: translation-update-upstream %if %suse_version > 1100 BuildRequires: libselinux-devel %endif @@ -36,7 +37,7 @@ AutoReqProv: on Obsoletes: glib2-64bit %endif # -Version: 2.22.1 +Version: 2.22.2 Release: 1 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ @@ -213,6 +214,7 @@ to a C programmer and is used by Gtk+ and GNOME. %lang_package %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 %patch8 From f94eb98b9e013b9096249bc15502b13abe1892266b51da1a2658ec05e832aad0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:49:44 +0000 Subject: [PATCH 4/7] Accepting request 25395 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 25395 revision 4. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25395 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=59 --- glib-2.22.2.tar.bz2 | 3 -- glib-2.23.0.tar.bz2 | 3 ++ glib2-aclocal.patch | 13 ------- glib2-mkinstalldirs.patch | 74 --------------------------------------- glib2.changes | 64 +++++++++++++++++++++++++++++++++ glib2.spec | 58 ++++++++++++++---------------- 6 files changed, 94 insertions(+), 121 deletions(-) delete mode 100644 glib-2.22.2.tar.bz2 create mode 100644 glib-2.23.0.tar.bz2 delete mode 100644 glib2-aclocal.patch delete mode 100644 glib2-mkinstalldirs.patch diff --git a/glib-2.22.2.tar.bz2 b/glib-2.22.2.tar.bz2 deleted file mode 100644 index 92d1830..0000000 --- a/glib-2.22.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3 -size 5490926 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 new file mode 100644 index 0000000..6d3a2c6 --- /dev/null +++ b/glib-2.23.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 +size 5028716 diff --git a/glib2-aclocal.patch b/glib2-aclocal.patch deleted file mode 100644 index f2edaed..0000000 --- a/glib2-aclocal.patch +++ /dev/null @@ -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 - diff --git a/glib2-mkinstalldirs.patch b/glib2-mkinstalldirs.patch deleted file mode 100644 index 5f7f83d..0000000 --- a/glib2-mkinstalldirs.patch +++ /dev/null @@ -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 \ diff --git a/glib2.changes b/glib2.changes index d6bf8a2..f372c8b 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +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 diff --git a/glib2.spec b/glib2.spec index 2d8af59..0ad2851 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.22.2) +# spec file for package glib2 (Version 2.23.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,27 +20,13 @@ 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.2 +Version: 2.23.0 +# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 +License: LGPL v2.1 or later 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,26 +36,37 @@ 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, @@ -109,7 +106,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 @@ -215,8 +211,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 +221,6 @@ if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then fi %build -autoreconf -fiv %configure \ --enable-static \ %if %suse_version > 1100 @@ -242,6 +235,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 From bef1c3b05d302d5cb0a508d06365c40c983d73b623b69499ec79dbfe85a3441d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 7 Dec 2009 13:37:07 +0000 Subject: [PATCH 5/7] en@shaw OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=60 --- glib2.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/glib2.spec b/glib2.spec index 0ad2851..1556ebc 100644 --- a/glib2.spec +++ b/glib2.spec @@ -21,7 +21,6 @@ Name: glib2 %define _name glib Version: 2.23.0 -# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 License: LGPL v2.1 or later Summary: A Library with Convenient Functions Written in C @@ -235,9 +234,9 @@ fi %install %makeinstall -# %if 0%{?suse_version} <= 1120 +%if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -# %endif +%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 From c0ac571ebca2df11a6ce2c92fc970295cedb21bfcff546accfcf560753b2618a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 09:33:59 +0000 Subject: [PATCH 6/7] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=61 --- glib-2.22.1.tar.bz2 | 3 ++ glib-2.23.0.tar.bz2 | 3 -- glib2-aclocal.patch | 13 +++++++ glib2-mkinstalldirs.patch | 74 +++++++++++++++++++++++++++++++++++++ glib2.changes | 78 --------------------------------------- glib2.spec | 57 +++++++++++++++------------- 6 files changed, 121 insertions(+), 107 deletions(-) create mode 100644 glib-2.22.1.tar.bz2 delete mode 100644 glib-2.23.0.tar.bz2 create mode 100644 glib2-aclocal.patch create mode 100644 glib2-mkinstalldirs.patch diff --git a/glib-2.22.1.tar.bz2 b/glib-2.22.1.tar.bz2 new file mode 100644 index 0000000..5de8db8 --- /dev/null +++ b/glib-2.22.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d +size 5476114 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 deleted file mode 100644 index 6d3a2c6..0000000 --- a/glib-2.23.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 -size 5028716 diff --git a/glib2-aclocal.patch b/glib2-aclocal.patch new file mode 100644 index 0000000..f2edaed --- /dev/null +++ b/glib2-aclocal.patch @@ -0,0 +1,13 @@ +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 + diff --git a/glib2-mkinstalldirs.patch b/glib2-mkinstalldirs.patch new file mode 100644 index 0000000..5f7f83d --- /dev/null +++ b/glib2-mkinstalldirs.patch @@ -0,0 +1,74 @@ +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 \ diff --git a/glib2.changes b/glib2.changes index f372c8b..2a48b0c 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,81 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/glib2.spec b/glib2.spec index 1556ebc..042e210 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.23.0) +# spec file for package glib2 (Version 2.22.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,27 @@ Name: glib2 %define _name glib -Version: 2.23.0 -Release: 1 +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 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 @@ -35,37 +50,26 @@ 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 -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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-lang = %{version} # 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 -# bug437293 -%ifarch ppc64 -Obsoletes: glib2-64bit -%endif -# +Requires: %{name}-branding +Obsoletes: glib2-doc <= 2.19.6 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, @@ -105,6 +109,7 @@ 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 @@ -210,6 +215,8 @@ 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 @@ -220,6 +227,7 @@ if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then fi %build +autoreconf -fiv %configure \ --enable-static \ %if %suse_version > 1100 @@ -234,9 +242,6 @@ fi %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 From 28bcdc300a775ad86ce0f6ecdf53bbc404d873e4c522161585eed491501530bf Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 8 Dec 2009 09:34:05 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/glib2 revision 75.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=8862a3bde702f3f2309000d1f5859489 --- glib-2.22.1.tar.bz2 | 3 -- glib-2.23.0.tar.bz2 | 3 ++ glib2-aclocal.patch | 13 ------- glib2-mkinstalldirs.patch | 74 ------------------------------------- glib2.changes | 78 +++++++++++++++++++++++++++++++++++++++ glib2.spec | 75 ++++++++++++++++++------------------- 6 files changed, 116 insertions(+), 130 deletions(-) delete mode 100644 glib-2.22.1.tar.bz2 create mode 100644 glib-2.23.0.tar.bz2 delete mode 100644 glib2-aclocal.patch delete mode 100644 glib2-mkinstalldirs.patch diff --git a/glib-2.22.1.tar.bz2 b/glib-2.22.1.tar.bz2 deleted file mode 100644 index 5de8db8..0000000 --- a/glib-2.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d -size 5476114 diff --git a/glib-2.23.0.tar.bz2 b/glib-2.23.0.tar.bz2 new file mode 100644 index 0000000..6d3a2c6 --- /dev/null +++ b/glib-2.23.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24002573dd17bc31c099cfa37853ccb0b510f2f6cf54222c3681b9b0ed5e9288 +size 5028716 diff --git a/glib2-aclocal.patch b/glib2-aclocal.patch deleted file mode 100644 index f2edaed..0000000 --- a/glib2-aclocal.patch +++ /dev/null @@ -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 - diff --git a/glib2-mkinstalldirs.patch b/glib2-mkinstalldirs.patch deleted file mode 100644 index 5f7f83d..0000000 --- a/glib2-mkinstalldirs.patch +++ /dev/null @@ -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 \ diff --git a/glib2.changes b/glib2.changes index 2a48b0c..f372c8b 100644 --- a/glib2.changes +++ b/glib2.changes @@ -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 diff --git a/glib2.spec b/glib2.spec index 042e210..90e6e8f 100644 --- a/glib2.spec +++ b/glib2.spec @@ -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