From 7b183379a5bed98a84d8381b557d7a91c2bd5257c28a4974666395dc93be8e63 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 18 Dec 2007 17:38:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=19 --- glib-2.14.1.tar.bz2 | 3 -- glib-2.14.4.tar.bz2 | 3 ++ allocsize.patch => glib2-allocsize.patch | 0 glib2.changes | 22 +++++++++- glib2.spec | 22 ++++++++-- gtk-doc.m4 | 52 +++++++++--------------- 6 files changed, 61 insertions(+), 41 deletions(-) delete mode 100644 glib-2.14.1.tar.bz2 create mode 100644 glib-2.14.4.tar.bz2 rename allocsize.patch => glib2-allocsize.patch (100%) diff --git a/glib-2.14.1.tar.bz2 b/glib-2.14.1.tar.bz2 deleted file mode 100644 index b52326e..0000000 --- a/glib-2.14.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d -size 3337370 diff --git a/glib-2.14.4.tar.bz2 b/glib-2.14.4.tar.bz2 new file mode 100644 index 0000000..8f5e130 --- /dev/null +++ b/glib-2.14.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff +size 3350956 diff --git a/allocsize.patch b/glib2-allocsize.patch similarity index 100% rename from allocsize.patch rename to glib2-allocsize.patch diff --git a/glib2.changes b/glib2.changes index ad1fdd9..3afaaa0 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,8 +1,28 @@ ------------------------------------------------------------------- -Thu Nov 29 20:32:25 CET 2007 - maw@suse.de +Mon Dec 17 14:59:45 CST 2007 - maw@suse.de + +- Update to version 2.14.4: + + Bugs (bugzilla.gnome.org) fixed: + #494602, #492677, #490061, #418778, #467537, #466557, #490637, + #445362, #498113, #498728, and #469551 +- Rename allocsize.patch to glib2-allocsize.patch. + +------------------------------------------------------------------- +Thu Nov 29 13:34:22 CST 2007 - maw@suse.de - Use the system's PCRE (#325921). +------------------------------------------------------------------- +Fri Nov 23 11:03:42 CST 2007 - maw@suse.de + +- Update to version 2.14.3: + + Bugs (bugzilla.gnome.org) fixed include #469231, #478349, + #483337, #478459, #477957, #359165, #476849, #493688, #488068, + and #487491 + + Updated translations + + Use PCRE 7.4 +- Update gtk-doc.m4: use the version from gtk-doc 1.9. + ------------------------------------------------------------------- Mon Oct 15 11:58:16 CEST 2007 - meissner@suse.de diff --git a/glib2.spec b/glib2.spec index a7dbe47..8f44517 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.14.1) +# spec file for package glib2 (Version 2.14.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ BuildRequires: fdupes pcre-devel pkg-config License: LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on -Version: 2.14.1 -Release: 18 +Version: 2.14.4 +Release: 1 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2 @@ -30,7 +30,7 @@ Patch0: glib-mkinstalldirs.patch Patch1: glib-aclocal.patch Patch2: glib-cast.patch Patch3: glib-gcc43.patch -Patch4: allocsize.patch +Patch4: glib2-allocsize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} # For temporary %%pre script only. @@ -185,8 +185,22 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/gtk-doc/html %changelog +* Mon Dec 17 2007 - maw@suse.de +- Update to version 2.14.4: + + Bugs (bugzilla.gnome.org) fixed: + [#494602], #492677, #490061, #418778, #467537, #466557, #490637, + [#445362], #498113, #498728, and #469551 +- Rename allocsize.patch to glib2-allocsize.patch. * Thu Nov 29 2007 - maw@suse.de - Use the system's PCRE (#325921). +* Fri Nov 23 2007 - maw@suse.de +- Update to version 2.14.3: + + Bugs (bugzilla.gnome.org) fixed include #469231, #478349, + [#483337], #478459, #477957, #359165, #476849, #493688, #488068, + and #487491 + + Updated translations + + Use PCRE 7.4 +- Update gtk-doc.m4: use the version from gtk-doc 1.9. * Mon Oct 15 2007 - meissner@suse.de - merge malloc size markup from BETA. * Thu Oct 11 2007 - rguenther@suse.de diff --git a/gtk-doc.m4 b/gtk-doc.m4 index 2e69090..384c224 100644 --- a/gtk-doc.m4 +++ b/gtk-doc.m4 @@ -9,45 +9,31 @@ AC_DEFUN([GTK_DOC_CHECK], AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, [with_html_dir='${datadir}/gtk-doc/html']) HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) + AC_SUBST([HTML_DIR]) dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) - have_gtk_doc=no if test x$enable_gtk_doc = xyes; then - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) fi - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ])