diff --git a/.gitignore b/.gitignore index 5797c78..5c7906f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wine-mono-0.0.8.tar.gz +/wine-mono-4.5.2.tar.gz diff --git a/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch b/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch deleted file mode 100644 index c1342dd..0000000 --- a/0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/runtime/Makefile.am b/runtime/Makefile.am -index c12d4a7..f70d4d2 100644 ---- a/runtime/Makefile.am -+++ b/runtime/Makefile.am -@@ -1,6 +1,3 @@ --# hack to prevent 'check' from depending on 'all' --AUTOMAKE_OPTIONS = cygnus -- - tmpinst = _tmpinst - - noinst_SCRIPTS = mono-wrapper monodis-wrapper diff --git a/sources b/sources index e67db1b..d567687 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5300eafb47b9258643581bcdf675f61f wine-mono-0.0.8.tar.gz +10a69a641881490bdfee48b2e4fdf63d wine-mono-4.5.2.tar.gz diff --git a/wine-mono-build-fixidtgeneration.patch b/wine-mono-build-fixidtgeneration.patch deleted file mode 100644 index 2da63ba..0000000 --- a/wine-mono-build-fixidtgeneration.patch +++ /dev/null @@ -1,277 +0,0 @@ ---- 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 () - { -- echo 'Directory\tDirectory_Parent\tDefaultDir' -- echo 's72\tS72\tl255' -- echo 'Directory\tDirectory' -- -- echo 'TARGETDIR\t\tSourceDir' -- echo 'MONODIR\tMONOBASEDIR\tmono-2.0:.' -- echo 'MONOBASEDIR\tWindowsFolder\tmono:.' -- echo 'WindowsFolder\tTARGETDIR\t.' -- echo 'WindowsDotNet\tWindowsFolder\tMicrosoft.NET' -- echo 'WindowsDotNetFramework\tWindowsDotNet\tFramework' -- echo 'WindowsDotNetFramework11\tWindowsDotNetFramework\tv1.1.4322' -- echo 'WindowsDotNetFramework11Config\tWindowsDotNetFramework11\tCONFIG' -- echo 'WindowsDotNetFramework20\tWindowsDotNetFramework\tv2.0.50727' -- echo 'WindowsDotNetFramework20Config\tWindowsDotNetFramework20\tCONFIG' -- echo 'WindowsDotNetFramework30\tWindowsDotNetFramework\tv3.0' -- echo 'WindowsDotNetFramework30wcf\tWindowsDotNetFramework30\twindows communication foundation' -- echo 'WindowsDotNetFramework30wpf\tWindowsDotNetFramework30\twpf' -- echo 'WindowsDotNetFramework40\tWindowsDotNetFramework\tv4.0.30319' -- echo 'WindowsDotNetFramework40Config\tWindowsDotNetFramework40\tCONFIG' -+ echo -e 'Directory\tDirectory_Parent\tDefaultDir' -+ echo -e 's72\tS72\tl255' -+ echo -e 'Directory\tDirectory' -+ -+ echo -e 'TARGETDIR\t\tSourceDir' -+ echo -e 'MONODIR\tMONOBASEDIR\tmono-2.0:.' -+ echo -e 'MONOBASEDIR\tWindowsFolder\tmono:.' -+ echo -e 'WindowsFolder\tTARGETDIR\t.' -+ echo -e 'WindowsDotNet\tWindowsFolder\tMicrosoft.NET' -+ echo -e 'WindowsDotNetFramework\tWindowsDotNet\tFramework' -+ echo -e 'WindowsDotNetFramework11\tWindowsDotNetFramework\tv1.1.4322' -+ echo -e 'WindowsDotNetFramework11Config\tWindowsDotNetFramework11\tCONFIG' -+ echo -e 'WindowsDotNetFramework20\tWindowsDotNetFramework\tv2.0.50727' -+ echo -e 'WindowsDotNetFramework20Config\tWindowsDotNetFramework20\tCONFIG' -+ echo -e 'WindowsDotNetFramework30\tWindowsDotNetFramework\tv3.0' -+ echo -e 'WindowsDotNetFramework30wcf\tWindowsDotNetFramework30\twindows communication foundation' -+ echo -e 'WindowsDotNetFramework30wpf\tWindowsDotNetFramework30\twpf' -+ echo -e 'WindowsDotNetFramework40\tWindowsDotNetFramework\tv4.0.30319' -+ echo -e 'WindowsDotNetFramework40Config\tWindowsDotNetFramework40\tCONFIG' - - cd "$CURDIR/image" - -@@ -196,7 +196,7 @@ - DIRNAME=MONODIR - fi - BASENAME=`basename $f` -- echo $KEY\\t$DIRNAME\\t$BASENAME -+ echo -e $KEY\\t$DIRNAME\\t$BASENAME - done - - cd "$CURDIR" -@@ -204,25 +204,25 @@ - - build_componenttable () - { -- echo 'Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath' -- echo 's72\tS38\ts72\ti2\tS255\tS72' -- 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' -- echo 'dotnet-folder\t{22DCE198-F30F-4E74-AEC6-D089B844A878}\tWindowsDotNet\t0\t\t' # needed to remove the folder -- echo 'framework-folder\t{41B3A67B-63F4-4491-A53C-9E792BE5A889}\tWindowsDotNetFramework\t0\t\t' -- echo 'framework11-folder\t{20F5741D-4655-400D-8373-7607A84D2478}\tWindowsDotNetFramework11\t0\t\t' -- echo 'framework20-folder\t{B845FD54-09B7-467C-800F-205A142F2F20}\tWindowsDotNetFramework20\t0\t\t' -- echo 'framework30-folder\t{C3221C80-F9D2-41B5-91E1-F6ADBB05ABBC}\tWindowsDotNetFramework30\t0\t\t' -- echo 'framework30wcf-folder\t{1ECAD22C-31C2-4BAC-AC74-78883C396FAB}\tWindowsDotNetFramework30wcf\t0\t\t' -- echo 'framework30wpf-folder\t{3C146462-0CAF-4F07-83E6-A75A2A5DE961}\tWindowsDotNetFramework30wpf\t0\t\t' -- echo 'framework40-folder\t{29ECF991-3E9E-4D23-B0B2-874631642B13}\tWindowsDotNetFramework40\t0\t\t' -- echo 'monobase-folder\t{BE46D94A-7443-4B5C-9B91-6A83815365AB}\tMONOBASEDIR\t0\t\t' -- echo 'mono-folder\t{FD7F9172-4E35-4DF5-BD6A-FB7B795D9346}\tMONODIR\t0\t\t' -+ echo -e 'Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath' -+ echo -e 's72\tS38\ts72\ti2\tS255\tS72' -+ 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' -+ echo -e 'dotnet-folder\t{22DCE198-F30F-4E74-AEC6-D089B844A878}\tWindowsDotNet\t0\t\t' # needed to remove the folder -+ echo -e 'framework-folder\t{41B3A67B-63F4-4491-A53C-9E792BE5A889}\tWindowsDotNetFramework\t0\t\t' -+ echo -e 'framework11-folder\t{20F5741D-4655-400D-8373-7607A84D2478}\tWindowsDotNetFramework11\t0\t\t' -+ echo -e 'framework20-folder\t{B845FD54-09B7-467C-800F-205A142F2F20}\tWindowsDotNetFramework20\t0\t\t' -+ echo -e 'framework30-folder\t{C3221C80-F9D2-41B5-91E1-F6ADBB05ABBC}\tWindowsDotNetFramework30\t0\t\t' -+ echo -e 'framework30wcf-folder\t{1ECAD22C-31C2-4BAC-AC74-78883C396FAB}\tWindowsDotNetFramework30wcf\t0\t\t' -+ echo -e 'framework30wpf-folder\t{3C146462-0CAF-4F07-83E6-A75A2A5DE961}\tWindowsDotNetFramework30wpf\t0\t\t' -+ echo -e 'framework40-folder\t{29ECF991-3E9E-4D23-B0B2-874631642B13}\tWindowsDotNetFramework40\t0\t\t' -+ echo -e 'monobase-folder\t{BE46D94A-7443-4B5C-9B91-6A83815365AB}\tMONOBASEDIR\t0\t\t' -+ echo -e 'mono-folder\t{FD7F9172-4E35-4DF5-BD6A-FB7B795D9346}\tMONODIR\t0\t\t' - - cd "$CURDIR/image" - -@@ -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'` -- echo $KEY\\t{$GUID}\\t$KEY\\t0\\t\\t$KEYPATH -+ echo -e $KEY\\t{$GUID}\\t$KEY\\t0\\t\\t$KEYPATH - done - - cd "$CURDIR" -@@ -244,20 +244,20 @@ - - build_createfoldertable () - { -- echo 'Directory_\tComponent_' -- echo 's72\ts72' -- echo 'CreateFolder\tDirectory_\tComponent_' -- -- echo 'WindowsDotNet\tdotnet-folder' -- echo 'WindowsDotNetFramework\tframework-folder' -- echo 'WindowsDotNetFramework11\tframework11-folder' -- echo 'WindowsDotNetFramework20\tframework20-folder' -- echo 'WindowsDotNetFramework30\tframework30-folder' -- echo 'WindowsDotNetFramework30wcf\tframework30wcf-folder' -- echo 'WindowsDotNetFramework30wpf\tframework30wpf-folder' -- echo 'WindowsDotNetFramework40\tframework40-folder' -- echo 'MONOBASEDIR\tmonobase-folder' -- echo 'MONODIR\tmono-folder' -+ echo -e 'Directory_\tComponent_' -+ echo -e 's72\ts72' -+ echo -e 'CreateFolder\tDirectory_\tComponent_' -+ -+ echo -e 'WindowsDotNet\tdotnet-folder' -+ echo -e 'WindowsDotNetFramework\tframework-folder' -+ echo -e 'WindowsDotNetFramework11\tframework11-folder' -+ echo -e 'WindowsDotNetFramework20\tframework20-folder' -+ echo -e 'WindowsDotNetFramework30\tframework30-folder' -+ echo -e 'WindowsDotNetFramework30wcf\tframework30wcf-folder' -+ echo -e 'WindowsDotNetFramework30wpf\tframework30wpf-folder' -+ echo -e 'WindowsDotNetFramework40\tframework40-folder' -+ echo -e 'MONOBASEDIR\tmonobase-folder' -+ echo -e 'MONODIR\tmono-folder' - - cd "$CURDIR/image" - -@@ -268,7 +268,7 @@ - FILE=`find "$f" -maxdepth 1 -type f` - if test ! "$FILE"; then - KEY=`echo $f|sed -e 's/\//|/g'` -- echo $KEY\\t$KEY -+ echo -e $KEY\\t$KEY - fi - done - -@@ -277,25 +277,25 @@ - - build_featurecomponentstable () - { -- echo 'Feature_\tComponent_' -- echo 's38\ts72' -- 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' -- echo 'wine_mono\tdotnet-folder' -- echo 'wine_mono\tframework-folder' -- echo 'wine_mono\tframework11-folder' -- echo 'wine_mono\tframework20-folder' -- echo 'wine_mono\tframework30-folder' -- echo 'wine_mono\tframework30wcf-folder' -- echo 'wine_mono\tframework30wpf-folder' -- echo 'wine_mono\tframework40-folder' -- echo 'wine_mono\tmonobase-folder' -- echo 'wine_mono\tmono-folder' -+ echo -e 'Feature_\tComponent_' -+ echo -e 's38\ts72' -+ 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' -+ echo -e 'wine_mono\tdotnet-folder' -+ echo -e 'wine_mono\tframework-folder' -+ echo -e 'wine_mono\tframework11-folder' -+ echo -e 'wine_mono\tframework20-folder' -+ echo -e 'wine_mono\tframework30-folder' -+ echo -e 'wine_mono\tframework30wcf-folder' -+ echo -e 'wine_mono\tframework30wpf-folder' -+ echo -e 'wine_mono\tframework40-folder' -+ echo -e 'wine_mono\tmonobase-folder' -+ echo -e 'wine_mono\tmono-folder' - - cd "$CURDIR/image" - -@@ -304,7 +304,7 @@ - continue - fi - KEY=`echo $f|sed -e 's/\//|/g'` -- echo wine_mono\\t$KEY -+ echo -e wine_mono\\t$KEY - done - - cd "$CURDIR" -@@ -312,9 +312,9 @@ - - build_filetable () - { -- echo 'File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence' -- echo 's72\ts72\tl255\ti4\tS72\tS20\tI2\ti2' -- echo 'File\tFile' -+ echo -e 'File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence' -+ echo -e 's72\ts72\tl255\ti4\tS72\tS20\tI2\ti2' -+ echo -e 'File\tFile' - - SEQ=0 - -@@ -343,7 +343,7 @@ - ;; - esac - -- echo $KEY\\t$COMPONENT\\t$BASENAME\\t$FILESIZE\\t\\t\\t\\t$SEQ -+ echo -e $KEY\\t$COMPONENT\\t$BASENAME\\t$FILESIZE\\t\\t\\t\\t$SEQ - done - - IMAGECAB_SEQ=$SEQ -@@ -353,11 +353,11 @@ - - build_mediatable () - { -- echo 'DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource' -- echo 'i2\ti4\tL64\tS255\tS32\tS72' -- echo 'Media\tDiskId' -+ echo -e 'DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource' -+ echo -e 'i2\ti4\tL64\tS255\tS32\tS72' -+ echo -e 'Media\tDiskId' - -- echo 1\\t$IMAGECAB_SEQ\\t\\t#image.cab\\t\\t -+ echo -e 1\\t$IMAGECAB_SEQ\\t\\t#image.cab\\t\\t - } - - 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.spec b/wine-mono.spec index 9b2c22e..f1be950 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 0.0.8 -Release: 3%{?dist} +Version: 4.5.2 +Release: 1%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -10,11 +10,6 @@ Group: Development/Libraries URL: http://wiki.winehq.org/Mono 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 - -# Fix FTBFS against latest automake -# Patch taken from upstream mono git, commit 052ba601f3ed9e7fc5a216407986a89ee0c3296f -Patch2: 0001-Remove-automake-macros-obsoleted-by-automake-1.13.-F.patch # see git://github.com/madewokherd/wine-mono @@ -55,10 +50,6 @@ Windows Mono library required for Wine. %prep %setup -q %patch0 -p1 -b.msifilename -%patch1 -p1 -b.fixidtgen -cd mono -%patch2 -p1 -b .automake -cd - %build # make sure this builds on x86-64 @@ -102,6 +93,10 @@ cp MonoGame/LICENSE.txt MonoGame-LICENSE.txt %{_datadir}/wine/mono/wine-mono-%{version}.msi %changelog +* Sun Dec 08 2013 Andreas Bierfert +- 4.5.2-1 +- version upgrade + * Sun Aug 04 2013 Fedora Release Engineering - 0.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild