From 87fb033ca5df6f64936888cd72ff7f46f3a1ff7e Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Tue, 10 Nov 2009 12:11:47 -0500
Subject: [PATCH] [#2181] Added RPM 64bits dbus patch
---
tools/build-system/build-osc.sh | 9 ++--
.../osc/sflphone-client-gnome.spec | 12 ++++-
...lphone-common-dbus-service-in-libdir.patch | 14 ++++++
tools/build-system/osc/sflphone-common.spec | 48 ++++++++++++-------
4 files changed, 62 insertions(+), 21 deletions(-)
create mode 100644 tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
diff --git a/tools/build-system/build-osc.sh b/tools/build-system/build-osc.sh
index 1cdccc19c5..30fb9ab3c0 100755
--- a/tools/build-system/build-osc.sh
+++ b/tools/build-system/build-osc.sh
@@ -18,11 +18,12 @@ WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
OSC_DIR="${WORKING_DIR}/osc"
LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
-LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" )
+#LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" )
+#LAUNCHPAD_PACKAGES=( "sflphone-common" )
REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
-SOFTWARE_VERSION="0.9.8~beta"
+SOFTWARE_VERSION="0.9.7.beta"
VERSION_INDEX=1
@@ -36,7 +37,7 @@ do
cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
- cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}.spec .
+ cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}* .
sed -i -e "s/VERSION_INDEX/${VERSION_INDEX}/g" -e "s/VERSION/${SOFTWARE_VERSION}/g" ${LAUNCHPAD_PACKAGE}.spec
@@ -45,6 +46,8 @@ do
rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
+ osc add *.patch
+
yes | osc commit --force -m "Version ${SOFTWARE_VERSION}"
done
diff --git a/tools/build-system/osc/sflphone-client-gnome.spec b/tools/build-system/osc/sflphone-client-gnome.spec
index 7c5be61a37..794dc7784e 100644
--- a/tools/build-system/osc/sflphone-client-gnome.spec
+++ b/tools/build-system/osc/sflphone-client-gnome.spec
@@ -64,10 +64,18 @@ Requires: dbus-1-glib
Requires: gtk2
Requires: glib2
Requires: libnotify
+Requires: libsexy
+
+%if %{defined suse_version}
Requires: librsvg
Requires: liblog4c3
-Requires: libsexy
-# gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+%endif
+
+%if %{defined fedora_version}
+Requires: librsvg2
+Requires: log4c
+%endif
+
Conflicts: sflphone
Prefix: %{_prefix}
diff --git a/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch b/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
new file mode 100644
index 0000000000..72d23454fb
--- /dev/null
+++ b/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
@@ -0,0 +1,14 @@
+diff --git sflphone-common/src/dbus/Makefile.am sflphone-common/src/dbus/Makefile.am
+index 5a2745e..5ca2e42 100644
+--- sflphone-common/src/dbus/Makefile.am
++++ sflphone-common/src/dbus/Makefile.am
+@@ -38,7 +38,7 @@ service_DATA = $(service_in_files:.service.in=.service)
+
+ # Rule to make the service file with bindir expanded
+ $(service_DATA): $(service_in_files) Makefile
+- sed -e "s|libexec|$(prefix)/lib/sflphone|" $<> $@
++ sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
+
+ EXTRA_DIST = *.xml README
+
+
diff --git a/tools/build-system/osc/sflphone-common.spec b/tools/build-system/osc/sflphone-common.spec
index f44328fee6..9fccf3ef7d 100644
--- a/tools/build-system/osc/sflphone-common.spec
+++ b/tools/build-system/osc/sflphone-common.spec
@@ -13,15 +13,15 @@ Name: sflphone-common
License: GNU General Public License (GPL)
Group: System Environment/Daemons
Summary: SIP and IAX2 compatible softphone - Core
-Version: VERSION
-Release: VERSION_INDEX%{?dist}
+Version: VERSION
+Release: VERSION_INDEX%{?dist}
URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-Group: Applications/Communications
BuildRoot: %{_tmppath}/%{name}
Source0: sflphone-common-%{version}.tar.gz
+Patch0: sflphone-common-dbus-service-in-libdir.patch
BuildRequires: speex-devel
BuildRequires: gcc-c++
BuildRequires: expat
@@ -55,19 +55,35 @@ BuildRequires: gsm-devel
%endif
Requires: libsamplerate
-Requires: libexpat1
Requires: commoncpp2
-Requires: libgsm1
-Requires: libspeex
Requires: dbus-1
Requires: dbus-1-x11
-Requires: xorg-x11
+
+%if %{defined suse_version}
+Requires: libgsm1
+Requires: libexpat1
+Requires: libspeex
Requires: libasound2
Requires: libpulse0
Requires: libccrtp1
+%endif
+
+%if %{defined fedora_version}
+Requires: gsm
+Requires: expat
+Requires: compat-expat1
+Requires: speex
+Requires: alsa-lib
+Requires: pulseaudio-libs
+Requires: ccrtp
+Requires: libzrtpcpp
+%endif
+
Conflicts: sflphone
Prefix: %{_prefix}
+Group: Applications/Communications
+
%description
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
@@ -84,13 +100,13 @@ Authors:
%build
cd libs/pjproject
./autogen.sh
-./configure --prefix=%{_prefix}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
make dep
make clean
make
cd -
./autogen.sh
-./configure --prefix=%{_prefix}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
make -j
%install
@@ -106,17 +122,17 @@ make clean
%files
%defattr(-, root, root)
%doc AUTHORS COPYING README TODO
-%dir %{_prefix}/lib/sflphone
-%dir %{_prefix}/lib/sflphone/codecs
-%dir %{_prefix}/lib/sflphone/plugins
+%dir %{_libdir}/sflphone
+%dir %{_libdir}/sflphone/codecs
+%dir %{_libdir}/sflphone/plugins
%dir %{_prefix}/share/sflphone
%dir %{_prefix}/share/sflphone/ringtones
-%{_prefix}/lib/libdbus-*
-%{_prefix}/lib/sflphone/codecs/*
-%{_prefix}/lib/sflphone/plugins/*
+%{_libdir}/libdbus-*
+%{_libdir}/sflphone/codecs/*
+%{_libdir}/sflphone/plugins/*
%{_prefix}/share/dbus-1/services/org.sflphone.*
%{_prefix}/share/sflphone/ringtones/*
-%{_prefix}/lib/sflphone/sflphoned
+%{_libdir}/sflphone/sflphoned
%doc %{_prefix}/share/man/man1/sflphoned.1.gz
%changelog
--
GitLab