diff --git a/wine-1.1.42.tar.bz2 b/wine-1.1.42.tar.bz2 deleted file mode 100644 index a8e14e8..0000000 --- a/wine-1.1.42.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:902c1cfe618f06b001a37c5e165db9645e7fc4c1ce994252ae10673dddf16e1a -size 16529436 diff --git a/wine-1.1.43.tar.bz2 b/wine-1.1.43.tar.bz2 new file mode 100644 index 0000000..9bac812 --- /dev/null +++ b/wine-1.1.43.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bde84e5a01f401e567aca864ca326f8823bfe0ef64cfb0c76ff162f46001d106 +size 16946211 diff --git a/wine.changes b/wine.changes index a15bd60..6e8be69 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Apr 19 13:24:18 CEST 2010 - meissner@suse.de + +- Updated to 1.1.43 + - A number of new icons. + - Improved support for alpha channel in bitmaps. + - Many Direct3D fixes and optimizations. + - More complete msvcr80/90 implementations. + - A wide range of 64-bit fixes. + - Various bug fixes. + +- Enabled 64bit packaging. + - "wine" package can now be either 64 or 32bit. + - "wine-32bit" package is the 32bit runtime system + which is used by both 32bit and 64bit wine packages. + It is required to run 32bit binaries. + ------------------------------------------------------------------- Fri Apr 2 20:52:05 CEST 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index d00ca89..b984184 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.42) +# spec file for package wine (Version 1.1.43) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,11 +18,11 @@ Name: wine -BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files +BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libv4l-devel libxslt-devel ncurses-devel openal-soft-devel openldap2-devel prelink sane-backends update-desktop-files License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.42 +Version: 1.1.43 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -31,9 +31,11 @@ Source1: http://kegel.com/wine/winetricks Source3: README.SuSE Source4: wine.desktop Recommends: wine-gecko wine-mp3 +Requires: wine-32bit = %version +%ifarch x86_64 +Requires: libX11.so.6()(64bit) libXext.so.6()(64bit) libXcursor.so.1()(64bit) libXi.so.6()(64bit) libXxf86vm.so.1()(64bit) libXrender.so.1()(64bit) libXrandr.so.2()(64bit) libXinerama.so.1()(64bit) libXcomposite.so.1()(64bit) libGL.so.1()(64bit) libGLU.so.1()(64bit) libxslt.so.1()(64bit) libncurses.so.6()(64bit) libfreetype.so.6()(64bit) libfontconfig.so.1()(64bit) libcups.so.2()(64bit) +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libhal.so.1 libncurses.so.5 libfreetype.so.6 libpng12.so.0 libjpeg.so.62 libcrypto.so.0.9.8 libssl.so.0.9.8 libfontconfig.so.1 libcups.so.2 libgnutls.so.26 -ExclusiveArch: %ix86 %description An MS Windows emulator, consisting of both runtime and source @@ -50,7 +52,22 @@ information. You can invoke wine by entering 'wine program.exe'. Configure it by running 'winecfg'. +%ifarch %ix86 +%package 32bit +Summary: The 32bit runtime system of Wine +License: LGPLv2.1+ +Group: System/Emulators/PC +# requires either 32bit or 64bit wine +Requires: wine = %version +# lib dependencies that are dynamically loaded +Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libhal.so.1 libncurses.so.6 libfreetype.so.6 libpng14.so.14.so.8 libcrypto.so.1.0.0 libssl.so.1.0.0 libfontconfig.so.1 libcups.so.2 libgnutls.so.26 + +%description 32bit +This package contains the 32bit runtime environmnent (libraries, DLLs, EXEs) of Wine. +It is required to run Win32 binaries. It requires either the 32bit or 64bit +"wine" environment to work. +%endif %package devel License: LGPLv2.1+ @@ -71,8 +88,13 @@ cp %{S:3} . %build cat VERSION -CFLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m64//'` \ -./configure --prefix=/usr --libdir=/usr/lib --with-x --verbose +%configure \ + --with-x \ +%ifarch x86_64 + --enable-win64 \ +%endif + --verbose + cat config.log grep "have_x=yes" config.log || exit 1 make %{?jobs:-j%jobs} depend @@ -89,25 +111,71 @@ mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr %suse_update_desktop_file %{SOURCE4} Emulator %fdupes -s $RPM_BUILD_ROOT +%ifarch %ix86 +# duplicate this binary only +cp $RPM_BUILD_ROOT/usr/bin/{wine,wine32} +%endif + %clean rm -rf $RPM_BUILD_ROOT +%ifarch %ix86 + +%post 32bit -p /sbin/ldconfig + +%postun 32bit -p /sbin/ldconfig +%else + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%endif %files %defattr(-,root,root) %doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* -/usr/bin/* +/usr/bin/function_grep.pl +/usr/bin/msiexec +/usr/bin/notepad +/usr/bin/regedit +/usr/bin/regsvr32 +/usr/bin/widl +/usr/bin/wine +/usr/bin/wineboot +/usr/bin/winebuild +/usr/bin/winecfg +/usr/bin/wineconsole +/usr/bin/winecpp +/usr/bin/winedbg +/usr/bin/winedump +/usr/bin/winefile +/usr/bin/wineg++ +/usr/bin/winegcc +/usr/bin/winemaker +/usr/bin/winemine +/usr/bin/winepath +/usr/bin/wineprefixcreate +/usr/bin/wineserver +/usr/bin/winetricks +/usr/bin/wmc +/usr/bin/wrc /usr/share/wine +/usr/share/applications/wine.desktop +%doc %{_mandir}/*/* + +%ifarch %ix86 + +%files 32bit +%defattr(-,root,root) +/usr/bin/wine32 +/usr/bin/wine-preloader +%endif + %{_libdir}/lib* %dir %{_libdir}/wine %{_libdir}/wine/*.so %dir %{_libdir}/wine/fakedlls %{_libdir}/wine/fakedlls/* -/usr/share/applications/wine.desktop -%doc %{_mandir}/*/* %files devel %defattr(-,root,root)