From 4fbeeec5e130ddc07d99339e685e84fec02af027 Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Fri, 4 Dec 2009 10:52:37 -0500
Subject: [PATCH] [#2181] Updated spec files

---
 tools/build-system/build-osc.sh                    |  2 +-
 tools/build-system/osc/sflphone-client-gnome.spec  |  1 +
 .../sflphone-common-dbus-service-in-libdir.patch   | 14 --------------
 tools/build-system/osc/sflphone-common.spec        |  4 +---
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete 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 13432ab327..8735ba83df 100755
--- a/tools/build-system/build-osc.sh
+++ b/tools/build-system/build-osc.sh
@@ -23,7 +23,7 @@ LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
 
 REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
 
-SOFTWARE_VERSION="0.9.7.rc1"
+SOFTWARE_VERSION="0.9.7.rc2"
 
 VERSION_INDEX=1
 
diff --git a/tools/build-system/osc/sflphone-client-gnome.spec b/tools/build-system/osc/sflphone-client-gnome.spec
index 794dc7784e..dba4cd8ebb 100644
--- a/tools/build-system/osc/sflphone-client-gnome.spec
+++ b/tools/build-system/osc/sflphone-client-gnome.spec
@@ -125,6 +125,7 @@ make clean
 %lang(zh_HK) %{_prefix}/share/locale/zh_HK/LC_MESSAGES/*.mo
 %lang(it) %{_prefix}/share/locale/it/LC_MESSAGES/*.mo
 %lang(pt_BR) %{_prefix}/share/locale/pt_BR/LC_MESSAGES/*.mo
+%lang(da) %{_prefix}/share/locale/da/LC_MESSAGES/*.mo
 %doc AUTHORS COPYING README
 %doc %{_prefix}/share/man/man1/sflphone-client-gnome.1.gz
 %doc %{_prefix}/share/man/man1/sflphone.1.gz
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
deleted file mode 100644
index 72d23454fb..0000000000
--- a/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 0bc1a2b573..d44f94103e 100644
--- a/tools/build-system/osc/sflphone-common.spec
+++ b/tools/build-system/osc/sflphone-common.spec
@@ -21,7 +21,6 @@ Packager:	Julien Bonjean <julien.bonjean@savoirfairelinux.com>
 
 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
@@ -95,7 +94,6 @@ Authors:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cd libs/pjproject
@@ -127,7 +125,7 @@ make clean
 %dir %{_libdir}/sflphone/plugins
 %dir %{_prefix}/share/sflphone
 %dir %{_prefix}/share/sflphone/ringtones
-%{_libdir}/libdbus-*
+%{_libdir}/sflphone/libdbus-*
 %{_libdir}/sflphone/codecs/*
 %{_libdir}/sflphone/plugins/*
 %{_prefix}/share/dbus-1/services/org.sflphone.*
-- 
GitLab