diff --git a/tools/build-system/build-osc.sh b/tools/build-system/build-osc.sh index 13432ab32719461715a46e062b8aed6a26044f03..8735ba83dfde2e019d8033e173f3676ac67cc4af 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 794dc7784e837ebecbf98a18f77336f8a4850701..dba4cd8ebbdf090931c142a83b961ed2299b0805 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 72d23454fb73ad3a87f1b83cdf9cc809a844d50a..0000000000000000000000000000000000000000 --- 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 0bc1a2b5735f438c0efef7d25ae32d5d64feee21..d44f94103e8e4e61fefc2be0a03d0e2b4a9f58c4 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.*