Hello community, here is the log from the commit of package psi for openSUSE:Factory checked in at 2012-03-29 14:04:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi (Old) and /work/SRC/openSUSE:Factory/.psi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/psi/psi.changes 2011-09-23 12:42:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psi.new/psi.changes 2012-03-29 14:04:31.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 21 22:45:50 UTC 2012 - [email protected] + +- Add psi-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- psi-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi.spec ++++++ --- /var/tmp/diff_new_pack.1LMkF4/_old 2012-03-29 14:04:33.000000000 +0200 +++ /var/tmp/diff_new_pack.1LMkF4/_new 2012-03-29 14:04:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package psi (Version 0.14) +# spec file for package psi # -# Copyright (c) 2010 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,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define otrplugin_version 0.5 Name: psi Url: http://psi-im.org/ -License: GPL-2.0+ -Group: Productivity/Networking/Talk/Clients Version: 0.14 -Release: 3 +Release: 0 Summary: Jabber client using Qt +License: GPL-2.0+ +Group: Productivity/Networking/Talk/Clients Source: http://downloads.sourceforge.net/psi/%{name}-%{version}.tar.bz2 # OTR support: http://public.beuth-hochschule.de/~s30935/ # http://public.beuth-hochschule.de/~s30935/files/psi-otr-0.5.tar.gz @@ -60,12 +59,13 @@ Patch3: %{name}-0.14-sxe-debug.patch Patch4: %{name}-0.14-desktop_file.patch Patch5: %{name}-0.14-signing-presence-optional.patch +Patch6: psi-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel +BuildRequires: fdupes +BuildRequires: libotr-devel BuildRequires: libqca2-devel BuildRequires: libqt4-devel -BuildRequires: libotr-devel -BuildRequires: fdupes BuildRequires: update-desktop-files Recommends: psimedia >= 1.0.3 @@ -95,6 +95,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 %build # do not use %%configure - not real configure script ++++++ psi-gcc47.patch ++++++ Index: psi-0.14/iris/src/irisnet/corelib/netinterface_unix.cpp =================================================================== --- psi-0.14.orig/iris/src/irisnet/corelib/netinterface_unix.cpp +++ psi-0.14/iris/src/irisnet/corelib/netinterface_unix.cpp @@ -27,6 +27,7 @@ #include "irisnetplugin.h" #include <sys/types.h> +#include <unistd.h> #include <sys/socket.h> #include <sys/ioctl.h> #include <net/if.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
