Merge lp:~tuxator/midori/win32-release into lp:midori

[Paweł Forysiuk]

makedist: strip version name, copy cert attributes and fix pkg-config

[Cris Dywan (kalikiana)]

An overview of options, such as DO_64BIT, would be useful, while reviewing I was wondering if it was an accidental change and it's basically nowhere defined.

Looks sane in any case.

review: Approve

=== modified file 'win32/makedist/makedist.midori'
--- win32/makedist/makedist.midori	2013-05-17 17:47:09 +0000
+++ win32/makedist/makedist.midori	2013-06-01 22:54:27 +0000
@@ -44,7 +44,7 @@
 
 #strip sha from version if release
 if [ "$RELEASE" != "" ];then
-    version=$(echo $version| awk -F \- '{print $1}')
+    version=$(echo $version| awk -F \~ '{print $1}')
 fi
 
 if [ "$1" != "" ]; then
@@ -202,7 +202,7 @@
 grab_files share midori.mo
 
 # We need to ship our CA bundle for now
-cp /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
+cp -a /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
 
 if [ "$GTK3_BUILD" == "1" ]; then
     grab_files share webkitgtk-3.0
 
=== modified file 'win32/makedist/win32-release'
--- win32/makedist/win32-release	2013-05-19 14:04:16 +0000
+++ win32/makedist/win32-release	2013-06-01 22:54:27 +0000
@@ -18,9 +18,9 @@
 export MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw"
 eval `rpm --eval %{mingw32_env}`
 
-./configure --prefix=$MINGW_PREFIX --enable-gtk3
+PKG_CONFIG_PATH="$MINGW_PREFIX/lib/pkgconfig/" ./configure --prefix=$MINGW_PREFIX --enable-gtk3
 make clean
-sudo make install
+sudo make install || exit
 
 rpmquery -qa mingw32* > midori-${version}-deps-i686.txt
 rm -f midori-$version.sha1
@@ -32,15 +32,15 @@
 dropbox puburl $dropbox_dir/midori-${version}.7z >  release_links.txt
 dropbox puburl $dropbox_dir/Midori-${version}_setup.exe >> release_links.txt
 
-if [ "$64BIT" != "" ]; then
+if [ "$DO_64BIT" != "" ]; then
     # 64-bit build
     #mingw64-env
     export MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw"
     eval `rpm --eval %{mingw64_env}`
 
-    ./configure --prefix=$MINGW_PREFIX --enable-gtk3
+    PKG_CONFIG_PATH="$MINGW_PREFIX/lib/pkgconfig/" ./configure --prefix=$MINGW_PREFIX --enable-gtk3
     make clean
-    sudo make install
+    sudo make install || exit
 
     rpmquery -qa mingw64* > midori-${version}-deps-x86_64.txt
     MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 sh ./win32/makedist/makedist.midori x86_64-portable