From 501b1938921a6202a3ad1f57c7ee63109e14b7dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 12 Apr 2015 13:11:09 +0200 Subject: [PATCH] - fix boost and platform detection - rel 10 --- ekiga.spec | 6 +++++- x32.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 x32.patch diff --git a/ekiga.spec b/ekiga.spec index 3170ab2..8e737f5 100644 --- a/ekiga.spec +++ b/ekiga.spec @@ -7,12 +7,13 @@ Summary: SIP and H.323 Videoconferencing Summary(pl.UTF-8): Program do telekonferencji w standardzie SIP oraz H.323 Name: ekiga Version: 4.0.1 -Release: 9 +Release: 10 License: GPL Group: Applications/Communications Source0: http://ftp.gnome.org/pub/GNOME/sources/ekiga/4.0/%{name}-%{version}.tar.xz # Source0-md5: 704ba532a8e3e0b5e3e2971dd2db39e4 Patch0: %{name}-shell.patch +Patch1: x32.patch URL: http://www.ekiga.org/ BuildRequires: GConf2-devel >= 2.14.0 BuildRequires: SDL-devel @@ -20,6 +21,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: avahi-devel >= 0.6 BuildRequires: avahi-glib-devel >= 0.6 +BuildRequires: boost-devel BuildRequires: dbus-glib-devel >= 0.60 BuildRequires: docbook-dtd412-xml BuildRequires: evolution-data-server-devel >= 1.6.1 @@ -75,6 +77,7 @@ obrazem. Ekiga była poprzednio znana jako GnomeMeeting. %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's|Categories=GNOME;GTK;Network;Telephony;|Categories=GTK;GNOME;Network;InstantMessaging;|' ekiga.desktop.in.in %build @@ -86,6 +89,7 @@ sed -i -e 's|Categories=GNOME;GTK;Network;Telephony;|Categories=GTK;GNOME;Networ %{__autoheader} %{__automake} %configure \ + --with-boost-libdir=%{_libdir} \ --disable-schemas-install \ --enable-dbus \ --disable-scrollkeeper diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..c38945a --- /dev/null +++ b/x32.patch @@ -0,0 +1,11 @@ +--- ekiga-4.0.1/configure.ac~ 2013-02-20 21:18:09.000000000 +0100 ++++ ekiga-4.0.1/configure.ac 2015-04-12 12:31:55.840637728 +0200 +@@ -90,7 +90,7 @@ + gm_platform="solaris" + ;; + +- linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux) ++ linux-gnulp | linux-gnu | linux-gnux32 | linux-gnueabi* | linux | Linux) + gm_platform="linux" + ;; + -- 2.43.0