diff --git a/.gitignore b/.gitignore index 05832fc..5797c78 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wine-mono-0.0.4.tar.gz +/wine-mono-0.0.8.tar.gz diff --git a/0052-Add-a-script-for-making-a-source-tarball.patch b/0052-Add-a-script-for-making-a-source-tarball.patch deleted file mode 100644 index 6cea0a3..0000000 --- a/0052-Add-a-script-for-making-a-source-tarball.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ceaaeaddbcea3b1d4cc99135c0ebf9a964861715 Mon Sep 17 00:00:00 2001 -From: Vincent Povirk -Date: Wed, 9 May 2012 16:26:03 -0500 -Subject: [PATCH 52/55] Add a script for making a source tarball. - ---- - archive.sh | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - create mode 100755 archive.sh - -diff --git a/archive.sh b/archive.sh -new file mode 100755 -index 0000000..6f7a048 ---- /dev/null -+++ b/archive.sh -@@ -0,0 +1,29 @@ -+#!/bin/sh -+ -+# usage: sh archive.sh tree-ish -+ -+recursivearchivefiles () -+{ -+ # recursivearchivefiles directory prefix tree-ish output-file -+ cd "$1" -+ for f in `git ls-files`; do -+ if test -d "$f/.git"; then -+ recursivearchivefiles "$PWD"/"$f" "$2""$f"/ "`git rev-parse HEAD:$f`" "$4" -+ cd "$1" -+ fi -+ done -+ -+ TEMPFILE=`tempfile` -+ git archive --format=tar --prefix="$2" "$3" > $TEMPFILE -+ tar Af "$4" "$TEMPFILE" -+ rm "$TEMPFILE" -+} -+ -+OUTPUT_FILE="$PWD/$1.tar" -+ -+rm "$OUTPUT_FILE" -+ -+recursivearchivefiles "$PWD" "$1"/ "$1" "$OUTPUT_FILE" -+ -+gzip "$OUTPUT_FILE" -+ --- -1.7.10.2 - diff --git a/0053-Rewrite-source-tarball-script.patch b/0053-Rewrite-source-tarball-script.patch deleted file mode 100644 index db65673..0000000 --- a/0053-Rewrite-source-tarball-script.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f69c420f65c41fb39aa3d2c013a7affa67fafe94 Mon Sep 17 00:00:00 2001 -From: Vincent Povirk -Date: Mon, 14 May 2012 11:39:29 -0500 -Subject: [PATCH 53/55] Rewrite source tarball script. - ---- - archive.sh | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) - -diff --git a/archive.sh b/archive.sh -index 6f7a048..b440001 100755 ---- a/archive.sh -+++ b/archive.sh -@@ -1,16 +1,33 @@ - #!/bin/sh - - # usage: sh archive.sh tree-ish -+# Archives a Git revision with all of its submodules. - - recursivearchivefiles () - { - # recursivearchivefiles directory prefix tree-ish output-file -+ - cd "$1" -- for f in `git ls-files`; do -- if test -d "$f/.git"; then -- recursivearchivefiles "$PWD"/"$f" "$2""$f"/ "`git rev-parse HEAD:$f`" "$4" -- cd "$1" -+ -+ echo Archiving: "$1" -+ -+ # recurse into submodules -+ git ls-tree -r "$3"|grep '^[^ ]* commit'|while read line; do -+ if test "x$line" = x; then -+ continue -+ fi -+ -+ obj=`echo "$line"|sed -e 's/^[^ ]* [^ ]* \([^ ]*\) .*$/\1/'` -+ filename=`echo "$line"|sed -e 's/^[^ ]* [^ ]* [^ ]* \(.*\)$/\1/'` -+ -+ if ! test -e "$1"/"$filename"/.git; then -+ echo Missing submodule: "$1"/"$filename" -+ continue - fi -+ -+ recursivearchivefiles "$1"/"$filename" "$2""$filename"/ "$obj" "$4" -+ -+ cd "$1" - done - - TEMPFILE=`tempfile` -@@ -21,9 +38,10 @@ recursivearchivefiles () - - OUTPUT_FILE="$PWD/$1.tar" - --rm "$OUTPUT_FILE" -+rm -f "$OUTPUT_FILE" - - recursivearchivefiles "$PWD" "$1"/ "$1" "$OUTPUT_FILE" - -+rm -f "$OUTPUT_FILE.gz" - gzip "$OUTPUT_FILE" - --- -1.7.10.2 - diff --git a/0054-build-winemono.sh-unset-CC-when-cross-compiling-othe.patch b/0054-build-winemono.sh-unset-CC-when-cross-compiling-othe.patch deleted file mode 100644 index df0dfa9..0000000 --- a/0054-build-winemono.sh-unset-CC-when-cross-compiling-othe.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a311dcaa0520d7ab755aea6671740dced221a853 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Mon, 11 Jun 2012 20:18:24 -0500 -Subject: [PATCH 54/55] build-winemono.sh: unset CC when cross compiling, - otherwise a native compiler will be used which fails. - ---- - build-winemono.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/build-winemono.sh b/build-winemono.sh -index 034cdeb..5fca71c 100755 ---- a/build-winemono.sh -+++ b/build-winemono.sh -@@ -43,6 +43,9 @@ done - - cross_build_mono () - { -+ # Unset CC, if it is set, otherwise the build scripts will attempt to use the wrong compiler -+ unset CC -+ - local MINGW=$1 - local ARCH=$2 - --- -1.7.10.2 - diff --git a/0055-Ship-MonoPosixHelper.dll.patch b/0055-Ship-MonoPosixHelper.dll.patch deleted file mode 100644 index edc9b1b..0000000 --- a/0055-Ship-MonoPosixHelper.dll.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8c857c1e72a145cd9c0904379615d09d4b9d1d98 Mon Sep 17 00:00:00 2001 -From: Vincent Povirk -Date: Wed, 13 Jun 2012 16:10:15 -0500 -Subject: [PATCH 55/55] Ship MonoPosixHelper.dll. - ---- - build-winemono.sh | 4 ++++ - mono | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/build-winemono.sh b/build-winemono.sh -index 5fca71c..f80c3ca 100755 ---- a/build-winemono.sh -+++ b/build-winemono.sh -@@ -63,12 +63,16 @@ cross_build_mono () - sed -e 's/-lgcc_s//' -i libtool - fi - WINEPREFIX=/dev/null make $MAKEOPTS || exit 1 -+ cd "$CURDIR/build-cross-$ARCH/support" -+ WINEPREFIX=/dev/null make $MAKEOPTS || exit 1 - rm -rf "$CURDIR/build-cross-$ARCH-install" -+ cd "$CURDIR/build-cross-$ARCH" - make install || exit 1 - cd "$CURDIR" - - mkdir -p "$CURDIR/image/bin" - cp "$CURDIR/build-cross-$ARCH-install/bin/libmono-2.0.dll" "$CURDIR/image/bin/libmono-2.0-$ARCH.dll" -+ cp "$CURDIR/build-cross-$ARCH/support/.libs/libMonoPosixHelper.dll" "$CURDIR/image/bin/MonoPosixHelper-$ARCH.dll" - } - - build_cli () diff --git a/sources b/sources index 0ff8081..e67db1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61c5ee49b8847c4dccfdab1fbc0706ae wine-mono-0.0.4.tar.gz +5300eafb47b9258643581bcdf675f61f wine-mono-0.0.8.tar.gz diff --git a/wine-mono-build-fixidtgeneration.patch b/wine-mono-build-fixidtgeneration.patch index f652479..2da63ba 100644 --- a/wine-mono-build-fixidtgeneration.patch +++ b/wine-mono-build-fixidtgeneration.patch @@ -1,6 +1,6 @@ ---- build-winemono.sh.orig 2012-06-26 21:09:02.185640667 +0200 -+++ build-winemono.sh 2012-06-26 21:14:24.272370920 +0200 -@@ -157,25 +157,25 @@ +--- wine-mono-0.0.8/build-winemono.sh.orig 2012-10-29 22:05:56.967460837 +0100 ++++ wine-mono-0.0.8/build-winemono.sh 2012-10-29 22:11:58.546925841 +0100 +@@ -164,25 +164,25 @@ build_directorytable () { @@ -45,7 +45,7 @@ cd "$CURDIR/image" -@@ -189,7 +189,7 @@ +@@ -196,7 +196,7 @@ DIRNAME=MONODIR fi BASENAME=`basename $f` @@ -54,7 +54,7 @@ done cd "$CURDIR" -@@ -197,24 +197,24 @@ +@@ -204,25 +204,25 @@ build_componenttable () { @@ -63,6 +63,7 @@ - echo 'Component\tComponent' - - echo 'mono-registry\t{93BE4304-497C-4ACB-A0FD-1C3695C011B4}\tWindowsDotNetFramework\t4\t\tDotNetFrameworkInstallRoot' +- echo 'mono-registry64\t{E088D122-0696-4137-BC4E-C999303B4BE2}\tWindowsDotNetFramework\t260\t\tDotNetFrameworkInstallRoot' - echo 'config-1.1\t{0DA29B5A-2050-4200-92EE-442D1EE6CF96}\tWindowsDotNetFramework11Config\t0\t\t1.1-machine.config' - echo 'config-2.0\t{ABB0BF6A-6610-4E45-8194-64D596667621}\tWindowsDotNetFramework20Config\t0\t\t2.0-machine.config' - echo 'config-4.0\t{511C0294-4504-4FC9-B5A7-E85CCEE95C6B}\tWindowsDotNetFramework40Config\t0\t\t4.0-machine.config' @@ -81,6 +82,7 @@ + echo -e 'Component\tComponent' + + echo -e 'mono-registry\t{93BE4304-497C-4ACB-A0FD-1C3695C011B4}\tWindowsDotNetFramework\t4\t\tDotNetFrameworkInstallRoot' ++ echo -e 'mono-registry64\t{E088D122-0696-4137-BC4E-C999303B4BE2}\tWindowsDotNetFramework\t260\t\tDotNetFrameworkInstallRoot' + echo -e 'config-1.1\t{0DA29B5A-2050-4200-92EE-442D1EE6CF96}\tWindowsDotNetFramework11Config\t0\t\t1.1-machine.config' + echo -e 'config-2.0\t{ABB0BF6A-6610-4E45-8194-64D596667621}\tWindowsDotNetFramework20Config\t0\t\t2.0-machine.config' + echo -e 'config-4.0\t{511C0294-4504-4FC9-B5A7-E85CCEE95C6B}\tWindowsDotNetFramework40Config\t0\t\t4.0-machine.config' @@ -97,7 +99,7 @@ cd "$CURDIR/image" -@@ -228,7 +228,7 @@ +@@ -236,7 +236,7 @@ fi GUID=`cat "$CURDIR/component-guids/${KEY}.guid"` KEYPATH=`find "$f" -maxdepth 1 -type f|sort|head -n 1|sed -e 's/\//!/g'` @@ -106,7 +108,7 @@ done cd "$CURDIR" -@@ -236,20 +236,20 @@ +@@ -244,20 +244,20 @@ build_createfoldertable () { @@ -141,7 +143,7 @@ cd "$CURDIR/image" -@@ -260,7 +260,7 @@ +@@ -268,7 +268,7 @@ FILE=`find "$f" -maxdepth 1 -type f` if test ! "$FILE"; then KEY=`echo $f|sed -e 's/\//|/g'` @@ -150,7 +152,7 @@ fi done -@@ -269,24 +269,24 @@ +@@ -277,25 +277,25 @@ build_featurecomponentstable () { @@ -159,6 +161,7 @@ - echo 'FeatureComponents\tFeature_\tComponent_' - - echo 'wine_mono\tmono-registry' +- echo 'wine_mono\tmono-registry64' - echo 'wine_mono\tconfig-1.1' - echo 'wine_mono\tconfig-2.0' - echo 'wine_mono\tconfig-4.0' @@ -177,6 +180,7 @@ + echo -e 'FeatureComponents\tFeature_\tComponent_' + + echo -e 'wine_mono\tmono-registry' ++ echo -e 'wine_mono\tmono-registry64' + echo -e 'wine_mono\tconfig-1.1' + echo -e 'wine_mono\tconfig-2.0' + echo -e 'wine_mono\tconfig-4.0' @@ -193,7 +197,7 @@ cd "$CURDIR/image" -@@ -295,7 +295,7 @@ +@@ -304,7 +304,7 @@ continue fi KEY=`echo $f|sed -e 's/\//|/g'` @@ -202,7 +206,7 @@ done cd "$CURDIR" -@@ -303,9 +303,9 @@ +@@ -312,9 +312,9 @@ build_filetable () { @@ -215,7 +219,7 @@ SEQ=0 -@@ -334,7 +334,7 @@ +@@ -343,7 +343,7 @@ ;; esac @@ -224,7 +228,7 @@ done IMAGECAB_SEQ=$SEQ -@@ -344,11 +344,11 @@ +@@ -353,11 +353,11 @@ build_mediatable () { @@ -239,4 +243,35 @@ + echo -e 1\\t$IMAGECAB_SEQ\\t\\t#image.cab\\t\\t } - build_msi () + hex_to_binary () +@@ -372,14 +372,14 @@ + + format_od_output () + { +- echo $2'\t'$3'\t'$4'\t'$5'\t' ++ echo -e $2'\t'$3'\t'$4'\t'$5'\t' + } + + build_msifilehashtable () + { +- echo 'File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4' +- echo 's72\ti2\ti4\ti4\ti4\ti4' +- echo 'MsiFileHash\tFile_' ++ echo -e 'File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4' ++ echo -e 's72\ti2\ti4\ti4\ti4\ti4' ++ echo -e 'MsiFileHash\tFile_' + + cd "$CURDIR/image" + +@@ -387,9 +387,9 @@ + KEY=`echo $f|sed -e 's/\//!/g'` + FILESIZE=`stat --format=%s $f` + +- echo -n $KEY\\t0\\t ++ echo -e -n $KEY\\t0\\t + if test $FILESIZE -eq 0; then +- echo '0\t0\t0\t0' ++ echo -e '0\t0\t0\t0' + else + format_od_output `md5sum $f|head -c 32|hex_to_binary|od -v -t d4` + fi diff --git a/wine-mono-build-msifilename.patch b/wine-mono-build-msifilename.patch index 21552ab..f89c170 100644 --- a/wine-mono-build-msifilename.patch +++ b/wine-mono-build-msifilename.patch @@ -1,9 +1,9 @@ ---- build-winemono.sh.orig 2012-06-17 21:36:07.966021810 +0200 -+++ build-winemono.sh 2012-06-17 21:38:27.681849104 +0200 +--- wine-mono-0.0.8/build-winemono.sh.orig 2012-10-29 22:15:31.409448612 +0100 ++++ wine-mono-0.0.8/build-winemono.sh 2012-10-29 22:15:52.878292404 +0100 @@ -9,7 +9,7 @@ ORIGINAL_PATH="$PATH" REBUILD=0 - WINE=${WINE:-wine} + WINE=${WINE:-`which wine`} -MSIFILENAME=winemono.msi +MSIFILENAME=${MSIFILENAME:-winemono.msi} BUILD_TESTS=0 diff --git a/wine-mono.spec b/wine-mono.spec index f690a0c..5b7ca51 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -1,22 +1,18 @@ %{?mingw_package_header} Name: wine-mono -Version: 0.0.4 -Release: 8%{?dist} +Version: 0.0.8 +Release: 1%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 Group: Development/Libraries URL: http://wiki.winehq.org/Mono -Source0: http://sourceforge.net/projects/wine/files/Wine%20Mono/0.0.4/wine-mono-0.0.4.tar.gz +Source0: http://sourceforge.net/projects/wine/files/Wine%20Mono/%{version}/%{name}-%{version}.tar.gz Patch0: wine-mono-build-msifilename.patch Patch1: wine-mono-build-fixidtgeneration.patch # see git://github.com/madewokherd/wine-mono -Patch100: 0052-Add-a-script-for-making-a-source-tarball.patch -Patch101: 0053-Rewrite-source-tarball-script.patch -Patch102: 0054-build-winemono.sh-unset-CC-when-cross-compiling-othe.patch -Patch103: 0055-Ship-MonoPosixHelper.dll.patch BuildArch: noarch @@ -53,12 +49,8 @@ Windows Mono library required for Wine. %prep %setup -q -%patch0 -b.msifilename -%patch1 -b.fixidtgen -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 +%patch0 -p1 -b.msifilename +%patch1 -p1 -b.fixidtgen %build # make sure this builds on x86-64 @@ -102,6 +94,10 @@ cp MonoGame/LICENSE.txt MonoGame-LICENSE.txt %{_datadir}/wine/mono/wine-mono-%{version}.msi %changelog +* Mon Oct 29 2012 Andreas Bierfert +- 0.0.8-1 +- version upgrade + * Sun Jul 22 2012 Fedora Release Engineering - 0.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild