From: Davide Franco <davide.franco@baculasystems.com>
Date: Fri, 30 Oct 2015 15:49:13 +0000 (+0100)
Subject: Update spec file for latest OSX versions
X-Git-Tag: Release-7.4.0~182
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c6ae8c4191c4b168a595648234d968ff02790b89;p=bacula%2Fbacula

Update spec file for latest OSX versions
---

diff --git a/bacula/platforms/osx/Makefile.in b/bacula/platforms/osx/Makefile.in
index f62e031dd3..512c81ee54 100644
--- a/bacula/platforms/osx/Makefile.in
+++ b/bacula/platforms/osx/Makefile.in
@@ -16,12 +16,12 @@ BACULA_VERSION:=@VERSION@
 BACULA_DL_URL:=http://downloads.sourceforge.net/project/bacula/bacula/${BACULA_VERSION}/bacula-${BACULA_VERSION}.tar.gz
 
 # Build universal binary. Comment out when building versions of bacula < 3.0.0
-ARCHFLAGS:=-arch i386 -arch ppc
-MACOSX_SDK_SYSROOT:=/Developer/SDKs/MacOSX10.4u.sdk
-MACOSX_VERSION_FLAGS:=-mmacosx-version-min=10.4
+ARCHFLAGS:=
+MACOSX_SDK_SYSROOT:=
+MACOSX_VERSION_FLAGS:=
 
 # Tools
-PM:=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+PB:=/usr/bin/pkgbuild
 MAKE:=/usr/bin/make
 CURL:=/usr/bin/curl
 TAR:=/usr/bin/tar
@@ -73,17 +73,17 @@ CONFIGFLAGS:= \
   --with-basename=@BASENAME@ \
   --with-hostname=@HOSTNAME@ \
   --with-working-dir=${BACULA_WORKING_DIR}
-CPPFLAGS:=-isysroot ${MACOSX_SDK_SYSROOT} ${MACOSX_VERSION_FLAGS}
-CFLAGS:=-O -g ${ARCHFLAGS}
+CPPFLAGS:=
+CFLAGS:=-O -g
 CXXFLAGS:=${CFLAGS}
-LDFLAGS:=-Wl,-syslibroot,${MACOSX_SDK_SYSROOT} ${MACOSX_VERSION_FLAGS} ${ARCHFLAGS}
+LDFLAGS:=
 
 # required on snow leopard: compiling for 10.4 requires usage of gcc 4.0
 # system defaults to version 4.2
-CC:=gcc-4.0
-CPP:=cpp-4.0
-CXX:=g++-4.0
-CXXPP:=cpp-4.0
+CC:=gcc
+CPP:=cpp
+CXX:=g++
+CXXPP:=cpp
 
 # Placeholders for *.in files
 INFILE_SUBST=\
@@ -99,8 +99,11 @@ dmg: pkg
 pkg: ${BACULA_DESTDIR} ${BACULA_PMDOC} ${WORKING_DIR}/resources
 	mkdir -p "${PACKAGE_DIR}"
 
-	${PM} --doc "${BACULA_PMDOC}" --id "${PACKAGE_ID}" --no-recommend --out "${PACKAGE_BUNDLE}"
+	mkdir -p "${CURDIR}/${BACULA_DESTDIR}${WORKING_DIR}"
 
+	${PB} --identifier "${PACKAGE_ID}" --root "${CURDIR}/${BACULA_DESTDIR}" "Bacula Enterprise File Daemon-${BACULA_VERSION}.pkg"
+	
+	cp "Bacula Enterprise File Daemon-${BACULA_VERSION}.pkg" "${PACKAGE_DIR}"
 	cp ${WORKING_DIR}/resources/ReadMe.html "${PACKAGE_DIR}/ReadMe.html"
 
 	sed ${INFILE_SUBST} \