Hello community, here is the log from the commit of package libinfinity for openSUSE:Factory checked in at 2012-01-05 19:13:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libinfinity (Old) and /work/SRC/openSUSE:Factory/.libinfinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libinfinity", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libinfinity/libinfinity.changes 2011-09-23 02:08:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libinfinity.new/libinfinity.changes 2012-01-05 19:13:39.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Dec 14 18:58:36 UTC 2011 - [email protected] + +- Add pam-devel BuildRequires to build with pam support. + +------------------------------------------------------------------- +Wed Nov 30 20:21:56 UTC 2011 - [email protected] + +- Add libinfinity-glib-2.31.patch: Fix build with glib 2.31. + +------------------------------------------------------------------- New: ---- libinfinity-glib-2.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinfinity.spec ++++++ --- /var/tmp/diff_new_pack.KXeWo1/_old 2012-01-05 19:13:40.000000000 +0100 +++ /var/tmp/diff_new_pack.KXeWo1/_new 2012-01-05 19:13:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libinfinity # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: libinfinity BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: gtk-doc +BuildRequires: pam-devel %if 0%{?favor_gtk2} BuildRequires: glib2-devel BuildRequires: gnutls-devel @@ -39,17 +37,19 @@ BuildRequires: pkgconfig(libgsasl) BuildRequires: pkgconfig(libxml-2.0) %endif -License: LGPLv2.1+ -Group: Development/Libraries/GNOME Version: 0.5.1 -Release: 1 +Release: 0 %define _version 0.5 Summary: Implementation of the Infinote collaborative editing protocol +License: LGPL-2.1+ +Group: Development/Libraries/GNOME Source0: http://releases.0x539.de/libinfinity/%{name}-%{version}.tar.gz Source1: infinoted.init Source2: infinoted.sysconfig Source3: infinoted.conf Patch0: infinoted-add-conf-subdir.patch +# PATCH-FIX-UPSTREAM libinfinity-glib-2.31.patch [email protected] -- Fix build with glib 2.31. Sent upstream by mail (vuntz, 2011-01-05) +Patch1: libinfinity-glib-2.31.patch Url: http://gobby.0x539.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +60,6 @@ platforms. %package -n libinfinity-1_0-0 -License: LGPLv2.1+ Summary: Implementation of the Infinote collaborative editing protocol Group: Development/Libraries/GNOME Recommends: %{name}-lang @@ -74,7 +73,6 @@ platforms. %package devel -License: LGPLv2.1+ Summary: Implementation of the Infinote collaborative editing protocol Group: Development/Libraries/GNOME Requires: libinfinity-1_0-0 = %{version} @@ -91,7 +89,6 @@ platforms. %package -n infinoted -License: LGPLv2.1+ Summary: Server for Collaborative Document Edition Group: Development/Libraries/GNOME Requires: libinfinity-1_0-0 = %{version} @@ -104,6 +101,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # -fno-strict-aliasing added 2009-05-07. Need for 0.3.0 -- vuntz ++++++ libinfinity-glib-2.31.patch ++++++ Index: libinfinity-0.5.1/infinoted/infinoted-creds.h =================================================================== --- libinfinity-0.5.1.orig/infinoted/infinoted-creds.h +++ libinfinity-0.5.1/infinoted/infinoted-creds.h @@ -22,8 +22,7 @@ #include <libinfinity/common/inf-certificate-credentials.h> -#include <glib/gtypes.h> -#include <glib/gerror.h> +#include <glib.h> #include <gnutls/gnutls.h> Index: libinfinity-0.5.1/infinoted/infinoted-util.h =================================================================== --- libinfinity-0.5.1.orig/infinoted/infinoted-util.h +++ libinfinity-0.5.1/infinoted/infinoted-util.h @@ -22,8 +22,7 @@ #include <libinfinity/inf-config.h> -#include <glib/gtypes.h> -#include <glib/gerror.h> +#include <glib.h> G_BEGIN_DECLS Index: libinfinity-0.5.1/libinfinity/common/inf-xml-util.h =================================================================== --- libinfinity-0.5.1.orig/libinfinity/common/inf-xml-util.h +++ libinfinity-0.5.1/libinfinity/common/inf-xml-util.h @@ -20,8 +20,7 @@ #ifndef __INF_XML_UTIL_H__ #define __INF_XML_UTIL_H__ -#include <glib/gtypes.h> -#include <glib/gerror.h> +#include <glib.h> #include <libxml/tree.h> G_BEGIN_DECLS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
