commit libinfinity for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package libinfinity for openSUSE:Factory checked in at Tue May 31 14:41:44 CEST 2011. -------- --- GNOME/libinfinity/libinfinity.changes 2010-11-30 09:56:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/libinfinity/libinfinity.changes 2011-05-27 23:57:00.000000000 +0200 @@ -1,0 +2,29 @@ +Fri May 27 23:55:50 CEST 2011 - vuntz@opensuse.org + +- Move to pkgconfig()-style BuildRequires if we target a gtk3 + build: + + Old ones: glib2-devel, gnutls-devel, libavahi-devel, + libdaemon-devel, libgsasl-devel, libxml2-devel. + + New ones: avahi-client, glib-2.0, gnutls, libdaemon, libgsasl, + libxml-2.0. + +------------------------------------------------------------------- +Thu Apr 28 14:09:30 UTC 2011 - dimstar@opensuse.org + +- Use favor_gtk2 to switch between gtk2 and gtk3 builds. +- For gtk3 build, add pkgconfig(gtk+-3.0) BuildRequires. +- Pass -with-gtk3/--without-gtk3 based on favor_gtk2 to configure. + +------------------------------------------------------------------- +Thu Apr 21 15:31:51 CEST 2011 - dimstar@opensuse.org + +- Update to version 0.5.0: + + infinoted: Added the --pam-server, --allow-user and + --allow-group command line options. + + Show cursor and selection of remote users in the own textview + and the scrollbar. + + Add optional support for GTK+ 3. + + Provide asynchronous SASL authentication. +- Rebase infinoted-add-conf-subdir.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libinfinity-0.4.2.tar.bz2 New: ---- libinfinity-0.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinfinity.spec ++++++ --- /var/tmp/diff_new_pack.wXKFAw/_old 2011-05-31 14:38:40.000000000 +0200 +++ /var/tmp/diff_new_pack.wXKFAw/_new 2011-05-31 14:38:40.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libinfinity (Version 0.4.2) +# spec file for package libinfinity # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -21,19 +21,29 @@ Name: libinfinity BuildRequires: fdupes BuildRequires: gettext-devel +BuildRequires: gtk-doc +%if 0%{?favor_gtk2} BuildRequires: glib2-devel BuildRequires: gnutls-devel -BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: libavahi-devel BuildRequires: libdaemon-devel BuildRequires: libgsasl-devel BuildRequires: libxml2-devel +%else +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libdaemon) +BuildRequires: pkgconfig(libgsasl) +BuildRequires: pkgconfig(libxml-2.0) +%endif License: LGPLv2.1+ Group: Development/Libraries/GNOME -Version: 0.4.2 +Version: 0.5.0 Release: 1 -%define _version 0.4 +%define _version 0.5 Summary: Implementation of the Infinote collaborative editing protocol Source0: %{name}-%{version}.tar.bz2 Source1: infinoted.init @@ -98,7 +108,12 @@ %build # -fno-strict-aliasing added 2009-05-07. Need for 0.3.0 -- vuntz CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure --disable-static --with-pic +%configure --disable-static --with-pic \ +%if 0%{?favor_gtk2} + --without-gtk3 +%else + --with-gtk3 +%endif make %{?jobs:-j%jobs} %install @@ -119,8 +134,9 @@ # to provide it also non-versioned. However, the init.d, sysconfig and xdg # config files are not versioned, and it will actually be bad for the user to # have them versioned (potential loss of configuration, for example). So let's -# just unversion the binary. +# just unversion the binary and man page mv %{buildroot}%{_bindir}/infinoted-%{_version} %{buildroot}%{_bindir}/infinoted +mv %{buildroot}%{_mandir}/man1/infinoted-%{_version}.1 %{buildroot}%{_mandir}/man1/infinoted.1 %fdupes $RPM_BUILD_ROOT %clean @@ -157,6 +173,7 @@ %files -n infinoted %defattr (-, root, root) %{_bindir}/infinoted +%{_mandir}/man1/infinoted.1%{?ext_man} %{_libdir}/infinoted-%{_version} # default configuration %dir %{_sysconfdir}/xdg/infinoted ++++++ infinoted-add-conf-subdir.patch ++++++ --- /var/tmp/diff_new_pack.wXKFAw/_old 2011-05-31 14:38:40.000000000 +0200 +++ /var/tmp/diff_new_pack.wXKFAw/_new 2011-05-31 14:38:40.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libinfinity-0.4.0/infinoted/infinoted-startup.c +Index: libinfinity-0.5.0/infinoted/infinoted-startup.c =================================================================== ---- libinfinity-0.4.0.orig/infinoted/infinoted-startup.c -+++ libinfinity-0.4.0/infinoted/infinoted-startup.c -@@ -208,7 +208,7 @@ infinoted_startup_load_options(Infinoted +--- libinfinity-0.5.0.orig/infinoted/infinoted-startup.c ++++ libinfinity-0.5.0/infinoted/infinoted-startup.c +@@ -212,7 +212,7 @@ infinoted_startup_load_options(Infinoted for(i = 0; i < n_system_config_dirs; ++ i) { config_files[n_system_config_dirs - i - 1] = ++++++ libinfinity-0.4.2.tar.bz2 -> libinfinity-0.5.0.tar.bz2 ++++++ ++++ 111318 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de