switch to bareos-addon package

We now have a bareos-addon rpm package that contains everything from the bareos-addons repo
bareos · Jun 17, 2015 · e2e32f4 · e2e32f4
1 parent 8dc8375
commit e2e32f4
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 47 deletions.
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
@@ -21,6 +21,14 @@ URL:            http://bareos.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+
+%define addonsdir /bareos-addons/
+BuildRequires:  bareos-addons
+
+%define SIGNCERT ia.p12
+%define SIGNPWFILE signpassword
+
+
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw64-cross-nsis
@@ -81,15 +89,11 @@ Source1:         winbareos.nsi
 Source2:         clientdialog.ini
 Source3:         directordialog.ini
 Source4:         storagedialog.ini
-Source5:         KillProcWMI.dll
 Source6:         bareos.ico
-Source7:         AccessControl.dll
-Source8:         LogEx.dll
 Source9:         databasedialog.ini
 
-# code signing cert
-Source10:        ia.p12
-Source11:        signpassword
+%define NSISDLLS KillProcWMI.dll AccessControl.dll LogEx.dll
+
 %description
 bareos
 
@@ -105,15 +109,19 @@ bareos
 
 %prep
 
+# unpack addons
+for i in `ls %addonsdir`; do
+   tar xvf %addonsdir/$i
+done
+
 
 %build
 for flavor in postvista postvista-debug prevista prevista-debug;
 do
    mkdir -p $RPM_BUILD_ROOT/$flavor/nsisplugins
-
-   cp %SOURCE5 $RPM_BUILD_ROOT/$flavor/nsisplugins  #  KillProcWMI
-   cp %SOURCE7 $RPM_BUILD_ROOT/$flavor/nsisplugins  #  AccessControl
-   cp %SOURCE8 $RPM_BUILD_ROOT/$flavor/nsisplugins  #  LogEx
+   for dll in %NSISDLLS; do
+      cp $dll $RPM_BUILD_ROOT/$flavor/nsisplugins
+   done
 
    for BITS in 32 64; do
       mkdir -p $RPM_BUILD_ROOT/$flavor/release${BITS}
@@ -209,7 +217,7 @@ do
       cp $RPM_BUILD_ROOT/$flavor/release${BITS}/Bareos*.exe \
            $RPM_BUILD_ROOT/winbareos-%version-$flavor-${BITS}-bit-r%release-unsigned.exe
 
-      osslsigncode  -pkcs12 %SOURCE10 -pass `cat %SOURCE11` -n "${DESCRIPTION}" -i http://www.bareos.com/ \
+      osslsigncode  -pkcs12 %SIGNCERT -pass `cat %SIGNPWFILE` -n "${DESCRIPTION}" -i http://www.bareos.com/ \
                     -in  $RPM_BUILD_ROOT/winbareos-%version-$flavor-${BITS}-bit-r%release-unsigned.exe \
                     -out $RPM_BUILD_ROOT/winbareos-%version-$flavor-${BITS}-bit-r%release.exe
 

diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -34,15 +34,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 #!BuildIgnore: post-build-checks
 
-Source1:        fillup.sed
-Source2:        vss_headers.tar
-Source3:        vdi_headers.tar
-Source4:        pgsql-libpq.tar
+%define addonsdir /bareos-addons/
+BuildRequires:  bareos-addons
+
+%define SIGNCERT ia.p12
+%define SIGNPWFILE signpassword
 
-# code signing cert
-Source10:       ia.p12
-Source11:       signpassword
 
+Source1:        fillup.sed
 Patch1:         tray-monitor-conf.patch
 Patch2:         tray-monitor-conf-fd-sd.patch
 
@@ -138,9 +137,10 @@ cp src/qt-tray-monitor/tray-monitor.conf.in.orig src/qt-tray-monitor/tray-monito
 mv src/qt-tray-monitor/tray-monitor.fd-sd-dir.conf.in src/qt-tray-monitor/tray-monitor.fd-sd.conf.in
 cp src/qt-tray-monitor/tray-monitor.conf.in.orig src/qt-tray-monitor/tray-monitor.fd-sd-dir.conf.in
 
-tar xvf %SOURCE2
-tar xvf %SOURCE3
-tar xvf %SOURCE4
+# unpack addons
+for i in `ls %addonsdir`; do
+   tar xvf %addonsdir/$i
+done
 
 CONTENT=`ls`
 
@@ -237,8 +237,8 @@ for flavor in `echo "%flavors"`; do
    pushd $RPM_BUILD_ROOT%{_mingw32_bindir}/$flavor
    for BINFILE in *; do
       mv $BINFILE $BINFILE.unsigned
-      osslsigncode -pkcs12 %SOURCE10 \
-                   -pass `cat %SOURCE11` \
+      osslsigncode -pkcs12 ${OLDPWD}/%SIGNCERT \
+                   -pass `cat ${OLDPWD}/%SIGNPWFILE` \
                    -n "${DESCRIPTION}" \
                    -i http://www.bareos.com/ \
                    -in  $BINFILE.unsigned \
@@ -252,12 +252,6 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %files
-#defattr(-,root,root)
-#/etc/%name/*.conf
-#/etc/%name/ddl/
-#dir %{_mingw32_bindir}
-#{_mingw32_bindir}/*.dll
-#{_mingw32_bindir}/*.exe
 
 
 %files prevista

diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
@@ -34,15 +34,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 #!BuildIgnore: post-build-checks
 
-Source1:        fillup.sed
-Source2:        vss_headers.tar
-Source3:        vdi_headers.tar
-Source4:        pgsql-libpq.tar
+%define addonsdir /bareos-addons/
+BuildRequires:  bareos-addons
+
+%define SIGNCERT ia.p12
+%define SIGNPWFILE signpassword
 
-# code signing cert
-Source10:       ia.p12
-Source11:       signpassword
 
+Source1:        fillup.sed
 Patch1:         tray-monitor-conf.patch
 Patch2:         tray-monitor-conf-fd-sd.patch
 
@@ -138,9 +137,10 @@ cp src/qt-tray-monitor/tray-monitor.conf.in.orig src/qt-tray-monitor/tray-monito
 mv src/qt-tray-monitor/tray-monitor.fd-sd-dir.conf.in src/qt-tray-monitor/tray-monitor.fd-sd.conf.in
 cp src/qt-tray-monitor/tray-monitor.conf.in.orig src/qt-tray-monitor/tray-monitor.fd-sd-dir.conf.in
 
-tar xvf %SOURCE2
-tar xvf %SOURCE3
-tar xvf %SOURCE4
+# unpack addons
+for i in `ls %addonsdir`; do
+   tar xvf %addonsdir/$i
+done
 
 CONTENT=`ls`
 
@@ -237,8 +237,8 @@ for flavor in `echo "%flavors"`; do
    pushd $RPM_BUILD_ROOT%{_mingw64_bindir}/$flavor
    for BINFILE in *; do
       mv $BINFILE $BINFILE.unsigned
-      osslsigncode -pkcs12 %SOURCE10 \
-                   -pass `cat %SOURCE11` \
+      osslsigncode -pkcs12 ${OLDPWD}/%SIGNCERT \
+                   -pass `cat ${OLDPWD}/%SIGNPWFILE` \
                    -n "${DESCRIPTION}" \
                    -i http://www.bareos.com/ \
                    -in  $BINFILE.unsigned \
@@ -252,12 +252,6 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %files
-#defattr(-,root,root)
-#/etc/%name/*.conf
-#/etc/%name/ddl/
-#dir %{_mingw64_bindir}
-#{_mingw64_bindir}/*.dll
-#{_mingw64_bindir}/*.exe
 
 
 %files prevista