use jldownload in winrpm.sh, remove trailing / from opensuse url

Makefile

@@ -517,15 +517,15 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
  cd dist-extras && \
  $(JLDOWNLOAD) http:https://downloads.sourceforge.net/sevenzip/7z920.exe && \
  7z x -y 7z920.exe 7z.exe 7z.dll && \
- ../contrib/windows/winrpm.sh http:https://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/ \
+ ../contrib/windows/winrpm.sh http:https://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \
  "mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1"
 else ifeq ($(ARCH),x86_64)
  cd dist-extras && \
  $(JLDOWNLOAD) 7z920-x64.msi http:https://downloads.sourceforge.net/sevenzip/7z920-x64.msi && \
  7z x -y 7z920-x64.msi _7z.exe _7z.dll && \
  mv _7z.dll 7z.dll && \
  mv _7z.exe 7z.exe && \
- ../contrib/windows/winrpm.sh http:https://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1/ \
+ ../contrib/windows/winrpm.sh http:https://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \
  "mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1"
 else
  $(error no win-extras target for ARCH=$(ARCH))

contrib/windows/winrpm.sh

@@ -83,7 +83,7 @@ for i in $toinstall; do
  checksum=$(echo $pkgi | $xp "/package/checksum/text()" -)
  eval $(echo $pkgi | $xp "/package/location/@href" -)
  echo "downloading $href"
- retry_curl $url/$href > $href
+ ../deps/jldownload $href $url/$href
  echo "$checksum *$href" | sha256sum -c
  7z x -y $href
  cpiofile=$(basename $href | sed 's/.rpm$/.cpio/')