win32: Do signing only in winbareos-nsi package

bareos · Jan 8, 2016 · 6a45e26 · 6a45e26
1 parent 3c5810f
commit 6a45e26
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 46 deletions.
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
@@ -176,8 +176,23 @@ do
       test_lib.exe \
       test_findlib.exe ;
    do
-      cp %{_mingw32_bindir}/$flavor/$file $RPM_BUILD_ROOT/$flavor/release32
-      cp %{_mingw64_bindir}/$flavor/$file $RPM_BUILD_ROOT/$flavor/release64
+      osslsigncode  sign \
+                    -pkcs12 %SIGNCERT \
+                    -readpass %SIGNPWFILE \
+                    -n "${DESCRIPTION}" \
+                    -i http://www.bareos.com/ \
+                    -t http://timestamp.comodoca.com/authenticode \
+                    -in  %{_mingw32_bindir}/$flavor/$file \
+                    -out $RPM_BUILD_ROOT/$flavor/release32/$file
+
+      osslsigncode  sign \
+                    -pkcs12 %SIGNCERT \
+                    -readpass %SIGNPWFILE \
+                    -n "${DESCRIPTION}" \
+                    -i http://www.bareos.com/ \
+                    -t http://timestamp.comodoca.com/authenticode \
+                    -in  %{_mingw64_bindir}/$flavor/$file \
+                    -out $RPM_BUILD_ROOT/$flavor/release64/$file
 
       osslsigncode verify -in $RPM_BUILD_ROOT/$flavor/release32/$file
       osslsigncode verify -in $RPM_BUILD_ROOT/$flavor/release64/$file

diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -38,9 +38,6 @@ BuildArch:      noarch
 %define addonsdir /bareos-addons/
 BuildRequires:  bareos-addons
 
-%define SIGNCERT ia.p12
-%define SIGNPWFILE signpassword
-
 Source1:        fillup.sed
 Patch1:         tray-monitor-conf.patch
 Patch2:         tray-monitor-conf-fd-sd.patch
@@ -87,9 +84,6 @@ BuildRequires:  mingw32-libjansson-devel
 BuildRequires:  sed
 BuildRequires:  vim, procps, bc
 
-BuildRequires:  osslsigncode
-BuildRequires:  obs-name-resolution-settings
-
 %description
 bareos
 
@@ -238,22 +232,6 @@ for flavor in `echo "%flavors"`; do
    do
       sed -f %SOURCE1 $sql -i ;
    done
-
-   # sign binary files
-   pushd $RPM_BUILD_ROOT%{_mingw32_bindir}/$flavor
-   for BINFILE in *; do
-      mv $BINFILE $BINFILE.unsigned
-      osslsigncode  sign \
-                   -pkcs12 ${OLDPWD}/%SIGNCERT \
-                   -readpass ${OLDPWD}/%SIGNPWFILE \
-                   -n "${DESCRIPTION}" \
-                   -i http://www.bareos.com/ \
-                   -t http://timestamp.comodoca.com/authenticode \
-                   -in  $BINFILE.unsigned \
-                   -out $BINFILE
-      rm *.unsigned
-   done
-   popd
 done
 
 %clean

diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
@@ -38,10 +38,6 @@ BuildArch:      noarch
 %define addonsdir /bareos-addons/
 BuildRequires:  bareos-addons
 
-%define SIGNCERT ia.p12
-%define SIGNPWFILE signpassword
-
-
 Source1:        fillup.sed
 Patch1:         tray-monitor-conf.patch
 Patch2:         tray-monitor-conf-fd-sd.patch
@@ -88,8 +84,6 @@ BuildRequires:  mingw64-libjansson-devel
 BuildRequires:  sed
 BuildRequires:  vim, procps, bc
 
-BuildRequires:  osslsigncode
-BuildRequires:  obs-name-resolution-settings
 %description
 bareos
 
@@ -238,22 +232,6 @@ for flavor in `echo "%flavors"`; do
    do
       sed -f %SOURCE1 $sql -i ;
    done
-
-   # sign binary files
-   pushd $RPM_BUILD_ROOT%{_mingw64_bindir}/$flavor
-   for BINFILE in *; do
-      mv $BINFILE $BINFILE.unsigned
-      osslsigncode sign \
-                   -pkcs12 ${OLDPWD}/%SIGNCERT \
-                   -readpass ${OLDPWD}/%SIGNPWFILE \
-                   -n "${DESCRIPTION}" \
-                   -i http://www.bareos.com/ \
-                   -t http://timestamp.comodoca.com/authenticode \
-                   -in  $BINFILE.unsigned \
-                   -out $BINFILE
-      rm *.unsigned
-   done
-   popd
 done
 
 %clean