From 3eb384ecfdcba10e78ec4114b3435353a609d245 Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Fri, 5 Jun 2009 17:10:34 -0400
Subject: [PATCH] [#1499] Fixed destination directory bug
---
.../distributions/mandriva/build-packages-mandriva.sh | 6 +++---
.../distributions/mandriva/sflphone-client-gnome.spec | 2 +-
.../distributions/mandriva/sflphone-client-kde.spec | 4 ++--
.../distributions/mandriva/sflphone-common.spec | 6 +++---
.../distributions/opensuse/sflphone-client-gnome.spec | 2 +-
.../distributions/opensuse/sflphone-client-kde.spec | 5 +++--
.../distributions/opensuse/sflphone-common.spec | 4 ++--
.../distributions/ubuntu/debian-sflphone-client-gnome/rules | 3 +--
.../distributions/ubuntu/debian-sflphone-client-kde/rules | 5 ++---
.../distributions/ubuntu/debian-sflphone-common/rules | 2 +-
10 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/tools/build-system/distributions/mandriva/build-packages-mandriva.sh b/tools/build-system/distributions/mandriva/build-packages-mandriva.sh
index 0b52d2cbeb..88137cba65 100755
--- a/tools/build-system/distributions/mandriva/build-packages-mandriva.sh
+++ b/tools/build-system/distributions/mandriva/build-packages-mandriva.sh
@@ -1,13 +1,13 @@
#!/bin/bash
#####################################################
-# File Name: build-packages-opensuse.sh
+# File Name: build-packages-mandriva.sh
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-27
-# Last Modified: 2009-06-01 17:24:52 -0400
+# Last Modified: 2009-06-04 16:29:34 -0400
#####################################################
. ../globals
@@ -75,7 +75,7 @@ do
cd ${PACKAGING_DIR}
echo " -> update spec file"
- sed "s/VERSION/${VERSION}/g" opensuse/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
+ sed "s/VERSION/${VERSION}/g" mandriva/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
if [ "$?" -ne "0" ]; then
echo "!! Cannot update spec file"
diff --git a/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec b/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec
index 5266efec37..eec0a71151 100644
--- a/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec
+++ b/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec
@@ -61,7 +61,7 @@ Authors:
make -j
%install
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
%clean
make clean
diff --git a/tools/build-system/distributions/mandriva/sflphone-client-kde.spec b/tools/build-system/distributions/mandriva/sflphone-client-kde.spec
index b4dedd48de..4bd7c29de2 100644
--- a/tools/build-system/distributions/mandriva/sflphone-client-kde.spec
+++ b/tools/build-system/distributions/mandriva/sflphone-client-kde.spec
@@ -50,11 +50,11 @@ Authors:
%setup -q
%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
make
%install
-make install
+make DESTDIR=%{buildroot} install
%clean
make clean
diff --git a/tools/build-system/distributions/mandriva/sflphone-common.spec b/tools/build-system/distributions/mandriva/sflphone-common.spec
index 35bcbe1e6c..5c17144b25 100644
--- a/tools/build-system/distributions/mandriva/sflphone-common.spec
+++ b/tools/build-system/distributions/mandriva/sflphone-common.spec
@@ -24,7 +24,7 @@ Source0: sflphone-common.tar.gz
BuildRequires: glibc-devel
BuildRequires: libccrtp-devel
BuildRequires: libsamplerate-devel
-BuildRequires: dbus-1-devel
+BuildRequires: libdbus-1-devel
BuildRequires: libexpat-devel
BuildRequires: libgsm-devel
BuildRequires: speex-devel
@@ -70,9 +70,9 @@ make -j
%install
cd libs/pjproject-1.0.1
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
cd -
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
%clean
cd libs/pjproject-1.0.1
diff --git a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec b/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
index f9cc62a3e2..dca63e7020 100644
--- a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
@@ -61,7 +61,7 @@ Authors:
make -j
%install
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
%clean
make clean
diff --git a/tools/build-system/distributions/opensuse/sflphone-client-kde.spec b/tools/build-system/distributions/opensuse/sflphone-client-kde.spec
index d4c7a34c04..0e5bd038db 100644
--- a/tools/build-system/distributions/opensuse/sflphone-client-kde.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-client-kde.spec
@@ -30,6 +30,7 @@ Requires: libqt4-x11
BuildRequires: cmake
BuildRequires: libkdepimlibs4-devel
BuildRequires: commoncpp2-devel
+BuildRequires: gettext-tools
Conflicts: sflphone
Prefix: %{_prefix}
@@ -50,11 +51,11 @@ Authors:
%setup -q
%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{buildroot}/%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
make
%install
-make install
+make DESTDIR=%{buildroot} install
%clean
make clean
diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec
index 721bda7e1a..fde81bc3a7 100644
--- a/tools/build-system/distributions/opensuse/sflphone-common.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-common.spec
@@ -69,9 +69,9 @@ make -j
%install
cd libs/pjproject-1.0.1
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
cd -
-make prefix=%{buildroot}/%{_prefix} install
+make DESTDIR=%{buildroot} install
%clean
cd libs/pjproject-1.0.1
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules
index d9d0eec817..2015960be0 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules
@@ -70,8 +70,7 @@ install-arch:
dh_installdirs -s
# Add here commands to install the arch part of the package into
# debian/tmp.
- $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
- rm -rf $(CURDIR)/debian/$(package)/usr/include
+ $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
dh_install -s
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
index d2384782b6..f1edaffc9d 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
@@ -20,7 +20,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- cmake . -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/$(package)/usr
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
touch configure-stamp
@@ -71,8 +71,7 @@ install-arch:
dh_installdirs -s
# Add here commands to install the arch part of the package into
# debian/tmp.
- $(MAKE) install
- rm -rf $(CURDIR)/debian/$(package)/usr/include
+ $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
dh_install -s
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
index 86794e0774..f2b173aee3 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
@@ -71,7 +71,7 @@ install-arch:
dh_installdirs -s
# Add here commands to install the arch part of the package into
# debian/tmp.
- $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
cd libs/pjproject-1.0.1; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
rm -rf $(CURDIR)/debian/$(package)/usr/include
dh_install -s
--
GitLab