Skip to content
Snippets Groups Projects
Commit 87fb033c authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#2181] Added RPM 64bits dbus patch

parent 10daa9db
Branches
Tags
No related merge requests found
...@@ -18,11 +18,12 @@ WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system" ...@@ -18,11 +18,12 @@ WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
OSC_DIR="${WORKING_DIR}/osc" OSC_DIR="${WORKING_DIR}/osc"
LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" ) 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" REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
SOFTWARE_VERSION="0.9.8~beta" SOFTWARE_VERSION="0.9.7.beta"
VERSION_INDEX=1 VERSION_INDEX=1
...@@ -36,7 +37,7 @@ do ...@@ -36,7 +37,7 @@ do
cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION} 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 sed -i -e "s/VERSION_INDEX/${VERSION_INDEX}/g" -e "s/VERSION/${SOFTWARE_VERSION}/g" ${LAUNCHPAD_PACKAGE}.spec
...@@ -45,6 +46,8 @@ do ...@@ -45,6 +46,8 @@ do
rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION} rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
osc add *.patch
yes | osc commit --force -m "Version ${SOFTWARE_VERSION}" yes | osc commit --force -m "Version ${SOFTWARE_VERSION}"
done done
......
...@@ -64,10 +64,18 @@ Requires: dbus-1-glib ...@@ -64,10 +64,18 @@ Requires: dbus-1-glib
Requires: gtk2 Requires: gtk2
Requires: glib2 Requires: glib2
Requires: libnotify Requires: libnotify
Requires: libsexy
%if %{defined suse_version}
Requires: librsvg Requires: librsvg
Requires: liblog4c3 Requires: liblog4c3
Requires: libsexy %endif
# gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
%if %{defined fedora_version}
Requires: librsvg2
Requires: log4c
%endif
Conflicts: sflphone Conflicts: sflphone
Prefix: %{_prefix} Prefix: %{_prefix}
......
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
...@@ -19,9 +19,9 @@ URL: http://www.sflphone.org/ ...@@ -19,9 +19,9 @@ URL: http://www.sflphone.org/
Vendor: Savoir-faire Linux Vendor: Savoir-faire Linux
Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com> Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
Group: Applications/Communications
BuildRoot: %{_tmppath}/%{name} BuildRoot: %{_tmppath}/%{name}
Source0: sflphone-common-%{version}.tar.gz Source0: sflphone-common-%{version}.tar.gz
Patch0: sflphone-common-dbus-service-in-libdir.patch
BuildRequires: speex-devel BuildRequires: speex-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: expat BuildRequires: expat
...@@ -55,19 +55,35 @@ BuildRequires: gsm-devel ...@@ -55,19 +55,35 @@ BuildRequires: gsm-devel
%endif %endif
Requires: libsamplerate Requires: libsamplerate
Requires: libexpat1
Requires: commoncpp2 Requires: commoncpp2
Requires: libgsm1
Requires: libspeex
Requires: dbus-1 Requires: dbus-1
Requires: dbus-1-x11 Requires: dbus-1-x11
Requires: xorg-x11
%if %{defined suse_version}
Requires: libgsm1
Requires: libexpat1
Requires: libspeex
Requires: libasound2 Requires: libasound2
Requires: libpulse0 Requires: libpulse0
Requires: libccrtp1 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 Conflicts: sflphone
Prefix: %{_prefix} Prefix: %{_prefix}
Group: Applications/Communications
%description %description
SFLphone is meant to be a robust enterprise-class desktop phone. SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License. SFLphone is released under the GNU General Public License.
...@@ -84,13 +100,13 @@ Authors: ...@@ -84,13 +100,13 @@ Authors:
%build %build
cd libs/pjproject cd libs/pjproject
./autogen.sh ./autogen.sh
./configure --prefix=%{_prefix} ./configure --prefix=%{_prefix} --libdir=%{_libdir}
make dep make dep
make clean make clean
make make
cd - cd -
./autogen.sh ./autogen.sh
./configure --prefix=%{_prefix} ./configure --prefix=%{_prefix} --libdir=%{_libdir}
make -j make -j
%install %install
...@@ -106,17 +122,17 @@ make clean ...@@ -106,17 +122,17 @@ make clean
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS COPYING README TODO %doc AUTHORS COPYING README TODO
%dir %{_prefix}/lib/sflphone %dir %{_libdir}/sflphone
%dir %{_prefix}/lib/sflphone/codecs %dir %{_libdir}/sflphone/codecs
%dir %{_prefix}/lib/sflphone/plugins %dir %{_libdir}/sflphone/plugins
%dir %{_prefix}/share/sflphone %dir %{_prefix}/share/sflphone
%dir %{_prefix}/share/sflphone/ringtones %dir %{_prefix}/share/sflphone/ringtones
%{_prefix}/lib/libdbus-* %{_libdir}/libdbus-*
%{_prefix}/lib/sflphone/codecs/* %{_libdir}/sflphone/codecs/*
%{_prefix}/lib/sflphone/plugins/* %{_libdir}/sflphone/plugins/*
%{_prefix}/share/dbus-1/services/org.sflphone.* %{_prefix}/share/dbus-1/services/org.sflphone.*
%{_prefix}/share/sflphone/ringtones/* %{_prefix}/share/sflphone/ringtones/*
%{_prefix}/lib/sflphone/sflphoned %{_libdir}/sflphone/sflphoned
%doc %{_prefix}/share/man/man1/sflphoned.1.gz %doc %{_prefix}/share/man/man1/sflphoned.1.gz
%changelog %changelog
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment