Download gcc dll's (and expat and zlib for win-extras) from opensuse

as part of win-extras

Makefile

@@ -388,7 +388,7 @@ ifeq ($(ARCH),x86_64)
 endif
 
  [ ! -d dist-extras ] || ( cd dist-extras && \
- cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(bindir) && \
+ cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(bindir) && \
  mkdir $(DESTDIR)$(prefix)/Git && \
  7z x PortableGit.7z -o"$(DESTDIR)$(prefix)/Git" && \
  echo "[core] eol = lf" >> "$(DESTDIR)$(prefix)/Git/etc/gitconfig" && \
@@ -496,20 +496,16 @@ 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 && \
- $(JLDOWNLOAD) http:https://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/noarch/mingw32-libexpat1-2.0.1-8.1.noarch.rpm && \
- mv mingw32-libexpat1-*.rpm mingw-libexpat.rpm && \
- $(JLDOWNLOAD) http:https://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/noarch/mingw32-zlib-1.2.8-3.12.noarch.rpm && \
- mv mingw32-zlib-*.rpm mingw-zlib.rpm
+ ../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 && \
- $(JLDOWNLOAD) http:https://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1/noarch/mingw64-libexpat1-2.0.1-7.1.noarch.rpm && \
- mv mingw64-libexpat1-*.rpm mingw-libexpat.rpm && \
- $(JLDOWNLOAD) http:https://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1/noarch/mingw64-zlib-1.2.8-3.1.noarch.rpm && \
- mv mingw64-zlib-*.rpm mingw-zlib.rpm
+ ../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))
 endif
@@ -522,8 +518,4 @@ endif
  $(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
  chmod a+x ./nsis/makensis.exe && \
  chmod a+x busybox.exe && \
- 7z x -y mingw-libexpat.rpm -so > mingw-libexpat.cpio && \
- 7z e -y mingw-libexpat.cpio && \
- 7z x -y mingw-zlib.rpm -so > mingw-zlib.cpio && \
- 7z e -y mingw-zlib.cpio && \
  $(JLDOWNLOAD) PortableGit.7z https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/PortableGit-1.9.5-preview20141217.7z