packaging: remove cmocka from winbareos and univention dsc file

bareos · Jun 26, 2018 · 1c20996 · 1c20996
1 parent ff7f8ea
commit 1c20996
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/core/platforms/packaging/bareos-Univention_4.2.dsc b/core/platforms/packaging/bareos-Univention_4.2.dsc
@@ -6,7 +6,7 @@ Version: 0.0.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.9.4
-Build-Depends: acl-dev, bc, chrpath, dh-systemd, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, init-system-helpers, libacl1-dev, libcap-dev, libcmocka-dev (>= 1.0.1), libfastlz-dev, libjansson-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, systemd, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
+Build-Depends: acl-dev, bc, chrpath, dh-systemd, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, init-system-helpers, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, systemd, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 DEBTRANSFORM-RELEASE: 1
 Files:
diff --git a/core/platforms/win32/winbareos-nsi.spec b/core/platforms/win32/winbareos-nsi.spec
@@ -85,9 +85,6 @@ BuildRequires:  mingw64-sqlite
 BuildRequires:  mingw32-libsqlite
 BuildRequires:  mingw64-libsqlite
 
-BuildRequires:  mingw32-cmocka
-BuildRequires:  mingw64-cmocka
-
 BuildRequires:  mingw32-libjansson
 BuildRequires:  mingw64-libjansson
 
@@ -159,7 +156,6 @@ for flavor in %{flavors}; do
 
    for file in \
       libcrypto-*.dll \
-      libcmocka.dll \
       libfastlz.dll \
       libgcc_s_*-1.dll \
       libhistory6.dll \

diff --git a/core/platforms/win32/winbareos.nsi b/core/platforms/win32/winbareos.nsi
@@ -595,7 +595,6 @@ SectionIn 1 2 3 4
 
   # install unittests
 #  File "test_*.exe"
-  File "/oname=cmocka.dll" "libcmocka.dll"
 
   # install configuration as templates
   SetOutPath "$INSTDIR\defaultconfigs\bareos-fd.d"
@@ -2169,7 +2168,6 @@ ConfDeleteSkip:
 
 # delete unittest bin
 #  Delete  "$INSTDIR\test_*.exe"
-  Delete  "$INSTDIR\cmocka.dll"
 
 # copied stuff from postgresql install
   Delete "$INSTDIR\libpq.dll"