Fix more changes for new buildchain

bareos · Feb 17, 2015 · 502145b · 502145b
1 parent 3f485b3
commit 502145b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
@@ -40,6 +40,27 @@ BuildRequires:  mingw32-winbareos  = %{version}
 BuildRequires:  mingw64-winbareos  = %{version}
 BuildRequires:  mingw-debugsrc-devel = %{version}
 
+BuildRequires:  mingw32-libgcc
+BuildRequires:  mingw64-libgcc
+
+BuildRequires:  mingw32-readline
+BuildRequires:  mingw64-readline
+
+BuildRequires:  mingw32-libstdc++
+BuildRequires:  mingw64-libstdc++
+
+BuildRequires:  mingw32-pthreads
+BuildRequires:  mingw64-pthreads
+
+BuildRequires:  mingw32-libqt4
+BuildRequires:  mingw64-libqt4
+
+BuildRequires:  mingw32-lzo
+BuildRequires:  mingw64-lzo
+
+BuildRequires:  mingw32-libfastlz
+BuildRequires:  mingw64-libfastlz
+
 
 Source1:         winbareos.nsi
 Source2:         clientdialog.ini
@@ -101,7 +122,7 @@ for file in \
    QtGui4.dll \
    liblzo2-2.dll \
    libfastlz.dll \
-   libpng15-15.dll \
+   libpng*.dll \
    openssl.exe \
    sed.exe;\
    do

diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi
@@ -404,7 +404,7 @@ SectionIn 1 2
   CreateShortCut "$SMSTARTUP\bareos-tray-monitor.lnk" "$INSTDIR\bareos-tray-monitor.exe" '-c "$APPDATA\${PRODUCT_NAME}\tray-monitor.conf"'
 
   File "bareos-tray-monitor.exe"
-  File "libpng15-15.dll"
+  File "libpng*.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"
 
@@ -420,7 +420,7 @@ SectionIn 2
   CreateShortCut "$DESKTOP\BAT.lnk" "$INSTDIR\bat.exe" '-c "$APPDATA\${PRODUCT_NAME}\bat.conf"'
 
   File "bat.exe"
-  File "libpng15-15.dll"
+  File "libpng*.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"
 
@@ -967,7 +967,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\QtGui4.dll"
   Delete "$INSTDIR\liblzo2-2.dll"
   Delete "$INSTDIR\libfastlz.dll"
-  Delete "$INSTDIR\libpng15-15.dll"
+  Delete "$INSTDIR\libpng*.dll"
   Delete "$INSTDIR\openssl.exe"
   Delete "$INSTDIR\sed.exe"