New version 1.6.2

This commit is contained in:
Andrey Bondrov 2016-02-10 22:14:57 +10:00
parent 866169e886
commit cf5ebb81d2
8 changed files with 27648 additions and 173 deletions

View file

@ -1,2 +1,2 @@
sources:
"wine-1.4.1.tar.bz2": cb79601ca92e8ecb8a5b6b64edc45fd366c3e579
wine-1.6.2.tar.bz2: 574b9ccedbf213622b7ee55f715764673fc27692

View file

@ -12,7 +12,7 @@
# then default bin directory
-if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi
+if [ -x "@bindir@/wine" ]; then
+ if [[ $compbit = "x86_64" ]]
+ if [ $compbit = "x86_64" ] && [ -x "@bindir@/wine64" ]
+ then
+ exec "@bindir@/wine64" "$appname" "$@"
+ else

View file

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEABECAAYFAk/bimYACgkQ9ebp7rlGHddhBQCfajZ9aLIDeGQcgydcZ1/SIJ/X
9vEAn0Dw/92kpxmuxZ4wJxLSXMmhGGo6
=TltJ
-----END PGP SIGNATURE-----

7
wine-1.6.2.tar.bz2.sign Normal file
View file

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iEYEABECAAYFAlLQWiQACgkQ9ebp7rlGHdch7gCfcHv6vxYNJmcKduLFXmxI1CSv
Q1UAnj6CE/iZyWheNrBihTDtrHf+k47O
=xcMN
-----END PGP SIGNATURE-----

View file

@ -1,2 +1,5 @@
addFilter("E: executable-in-library-package")
addFilter("E: non-versioned-file-in-library-package")
addFilter("E: incoherent-version-in-name")
# Intentional - linking to Linux libc would cause symbol clashes with MS libc
addFilter("E: library-not-linked-against-libc")

303
wine.spec
View file

@ -5,10 +5,10 @@
%define wine wine
%define mark64 %{nil}
%endif
%define lib_name_orig lib%{name}
%define lib_major 1
%define lib_name %mklibname %{name} %{lib_major}
%define lib_name_devel %{mklibname -d wine}
%define major 1
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
# On 32-bit we have
# wine32 - those 32-bit binaries that are also used on 64-bit for 32-bit support
@ -17,146 +17,123 @@
# wine64 - all 64-bit files (suggests 'wine32')
# - Anssi 07/2010
Name: wine
#(peroyvind): please do backports for new versions
Version: 1.4.1
Release: 2
%define o_ver %{version}
Epoch: 2
Summary: WINE Is Not An Emulator - runs MS Windows programs
Name: wine
Version: 1.6.2
Release: 1
Epoch: 2
License: LGPLv2+
Group: Emulators
URL: http://www.winehq.com/
Source0: http://prdownloads.sourceforge.net/wine/%{name}-%{o_ver}.tar.bz2
Source1: http://prdownloads.sourceforge.net/wine/%{name}-%{o_ver}.tar.bz2.sign
Url: http://www.winehq.com/
Source0: http://mirrors.ibiblio.org/wine/source/%(echo %{version} |cut -d. -f1-2)/%{name}-%{version}.tar.bz2
Source1: http://mirrors.ibiblio.org/wine/source/%(echo %{version} |cut -d. -f1-2)/%{name}-%{version}.tar.bz2.sign
# RH stuff
Source2: wine.init
Source10: wine.rpmlintrc
Source10: %{name}.rpmlintrc
Source11: http://kegel.com/wine/winetricks
Source12: http://kegel.com/wine/wisotool
Patch0: wine-1.0-rc3-fix-conflicts-with-openssl.patch
Patch1: wine-1.1.7-chinese-font-substitutes.patch
Patch2: wine-1.3.24-64bit-tools.patch
# (Anssi 05/2008) Adds:
# a: => /media/floppy (/mnt/floppy on 2007.1 and older)
# d: => $HOME (at config_dir creation time, not refreshed if $HOME changes;
# note that Wine also provides $HOME in My Documents)
# only on 2008.0: e: => /media/cdrom (does not exist on 2008.1+)
# only on 2007.1 and older: e: => /mnt/cdrom
# com4 => /dev/ttyUSB0 (replaces /dev/ttyS3)
# have to substitute @MDKVERSION@ in dlls/ntdll/server.c
Patch108: wine-mdkconf.patch
Patch200: wine-1.3.24-64bit-tools.patch
# (anssi) Wine needs GCC 4.4+ on x86_64 for MS ABI support. Note also that
# 64-bit wine cannot run 32-bit programs without wine32.
ExclusiveArch: %{ix86}
%if %{mdkversion} >= 201010
ExclusiveArch: x86_64
%endif
%ifarch x86_64
BuildRequires: gcc >= 4.4
%endif
BuildRequires: bison flex
BuildRequires: gpm-devel
BuildRequires: perl-devel
BuildRequires: ncurses-devel
BuildRequires: cups-devel
BuildRequires: sane-devel
BuildRequires: lcms-devel
BuildRequires: autoconf
BuildRequires: docbook-utils docbook-dtd-sgml
BuildRequires: docbook-utils docbook-dtd-sgml sgml-tools
BuildRequires: jackit-devel
BuildRequires: pulseaudio-devel
BuildRequires: libmpg123-devel
BuildRequires: openal-devel
BuildRequires: libalsa-devel
BuildRequires: gstreamer0.10-devel libgstreamer0.10-plugins-base-devel
BuildRequires: isdn4k-utils-devel
BuildRequires: glibc-static-devel
BuildRequires: bison
BuildRequires: chrpath
BuildRequires: ungif-devel xpm-devel
BuildRequires: tiff-devel
BuildRequires: librsvg
BuildRequires: imagemagick
BuildRequires: gphoto2-devel
BuildRequires: desktop-file-utils
BuildRequires: openldap-devel
BuildRequires: libxslt-devel
BuildRequires: dbus-devel
BuildRequires: valgrind
BuildRequires: gsm-devel
BuildRequires: unixODBC-devel
BuildRequires: gnutls-devel
BuildRequires: gettext-devel
BuildRequires: mesaglu-devel
BuildRequires: libv4l-devel
BuildRequires: libxcursor-devel libxcomposite-devel
BuildRequires: libxinerama-devel libxrandr-devel
BuildRequires: libx11-devel libxrender-devel
BuildRequires: libxext-devel libsm-devel
BuildRequires: fontforge fontconfig-devel freetype2-devel
BuildRequires: bison flex gpm-devel perl-devel ncurses-devel sgml-tools
BuildRequires: libx11-devel libxrender-devel libxext-devel libsm-devel
BuildRequires: freetype2-devel autoconf docbook-utils docbook-dtd-sgml
BuildRequires: cups-devel jackit-devel imagemagick isdn4k-utils-devel xpm-devel
BuildRequires: sane-devel glibc-static-devel ungif-devel chrpath
BuildRequires: desktop-file-utils libalsa-devel openldap-devel lcms-devel
BuildRequires: libxslt-devel dbus-devel
BuildRequires: valgrind librsvg pulseaudio-devel gettext-devel
BuildRequires: gsm-devel
BuildRequires: mesaglu-devel
BuildRequires: docbook-dtd-sgml
BuildRequires: docbook-utils
BuildRequires: flex
BuildRequires: fontforge
BuildRequires: gphoto2-devel
BuildRequires: unixODBC-devel
BuildRequires: libmpg123-devel
BuildRequires: openal-devel libxrandr-devel libxinerama-devel libxcomposite-devel
BuildRequires: libxcursor-devel fontconfig-devel
BuildRequires: gnutls-devel tiff-devel libv4l-devel
BuildRequires: gstreamer0.10-devel libgstreamer0.10-plugins-base-devel
%if "%{distepoch}" >= "2011.0"
BuildRequires: imagemagick
BuildRequires: prelink
%endif
BuildRequires: sgml-tools
BuildRequires: valgrind
BuildRequires: cups-devel
BuildRequires: gettext-devel
BuildRequires: glibc-static-devel
BuildRequires: gpm-devel
BuildRequires: gsm-devel
BuildRequires: isdn4k-utils-devel
BuildRequires: openldap-devel
BuildRequires: perl-devel
BuildRequires: sane-devel
BuildRequires: tiff-devel
BuildRequires: ungif-devel
BuildRequires: unixODBC-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(lcms)
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: pkgconfig(libmpg123)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(ncursesw)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
%define desc Wine is a program which allows running Microsoft Windows programs \
(including DOS, Windows 3.x and Win32 executables) on Unix. It \
consists of a program loader which loads and executes a Microsoft \
Windows binary, and a library (called Winelib) that implements Windows \
API calls using their Unix or X11 equivalents. The library may also \
be used for porting Win32 code into native Unix executables.
ExclusiveArch: %{ix86}
ExclusiveArch: x86_64
#----------------------------------------------------------------------------
%ifarch x86_64
%package -n %{wine}
Summary: WINE Is Not An Emulator - runs MS Windows programs
Group: Emulators
Suggests: wine32 = %{EVRD}
Suggests: wine64-gecko
Suggests: libncursesw.so.5%{mark64} libncurses.so.5%{mark64}
Suggests: libncursesw.so.5%{mark64}
Suggests: libncurses.so.5%{mark64}
%else
# on 32-bit we always want wine32 package
Requires: wine32 = %{EVRD}
%endif
Provides: %{wine}-utils = %{EVRD} %{wine}-full = %{EVRD}
Provides: %{lib_name}-capi = %{EVRD} %{lib_name}-twain = %{EVRD}
Provides: %{lib_name} = %{EVRD}
%rename %{wine}-utils
%rename %{wine}-full
%rename %{libname}-capi
%rename %{libname}-twain
%rename %{libname}
Provides: wine-bin = %{EVRD}
Obsoletes: %{wine}-utils %{wine}-full %{lib_name}-capi %{lib_name}-twain
Obsoletes: %{lib_name} <= %{EVRD}
Requires: xmessage
Suggests: sane-frontends
# wine dlopen's these, so let's add the dependencies ourself
Requires: libfreetype.so.6%{mark64} libasound.so.2%{mark64}
Requires: libfreetype.so.6%{mark64}
Requires: libasound.so.2%{mark64}
Requires: libXrender.so.1%{mark64}
Requires: libpng12.so.0%{mark64}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires(post): desktop-common-data
Requires(postun): desktop-common-data
Requires(preun): rpm-helper
Requires(post): rpm-helper
Conflicts: %{wine} < 1:0.9-3mdk
Requires(post,postun): desktop-common-data
Requires(post,preun): rpm-helper
# for winetricks:
Requires: cabextract
Requires: unzip
Suggests: webcore-fonts
%ifarch %{ix86}
Conflicts: wine64
%else
@ -164,16 +141,28 @@ Conflicts: wine
%endif
%description
%desc
Wine is a program which allows running Microsoft Windows programs
(including DOS, Windows 3.x and Win32 executables) on Unix. It
consists of a program loader which loads and executes a Microsoft
Windows binary, and a library (called Winelib) that implements Windows
API calls using their Unix or X11 equivalents. The library may also
be used for porting Win32 code into native Unix executables.
%ifarch x86_64
%description -n %{wine}
%desc
Wine is a program which allows running Microsoft Windows programs
(including DOS, Windows 3.x and Win32 executables) on Unix. It
consists of a program loader which loads and executes a Microsoft
Windows binary, and a library (called Winelib) that implements Windows
API calls using their Unix or X11 equivalents. The library may also
be used for porting Win32 code into native Unix executables.
This package contains the Win64 version of Wine. You need the wine32
package from the 32-bit repository to be able to run 32-bit applications.
%endif
#----------------------------------------------------------------------------
%ifarch %{ix86}
%package -n wine32
Summary: 32-bit support for Wine
@ -182,13 +171,8 @@ Group: Emulators
# resolve the dependency to wine64 even on upgrades, and therefore replace
# wine+wine32 installation with a wine32+wine64 installation. - Anssi
Requires: wine-bin
Conflicts: wine < 1:1.2-0.rc7.1
Conflicts: wine64 < 1:1.2-0.rc7.1
# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
# start proposing to download wine-gecko from sourceforge, while recommending
# to use distribution packages instead. Therefore suggest wine-gecko here:
Suggests: wine-gecko
Suggests: libncursesw.so.5 libncurses.so.5
Suggests: libncursesw.so.5
Suggests: libncurses.so.5
%description -n wine32
Wine is a program which allows running Microsoft Windows programs
@ -198,13 +182,13 @@ This package contains the files needed to support 32-bit Windows
programs.
%endif
#----------------------------------------------------------------------------
%package -n %{wine}-devel
Summary: Static libraries and headers for %{name}
Group: Development/C
Requires: %{wine} = %{EVRD}
%rename %{lib_name_devel}
Provides: %{lib_name_orig}-devel = %{EVRD}
Obsoletes: %{mklibname -d wine 1} < %{EVRD}
%rename %{devname}
%ifarch %{ix86}
Conflicts: wine64-devel
%else
@ -220,16 +204,43 @@ develop programs which make use of wine.
Wine is often updated.
%prep
%setup -q -n %{name}-%{o_ver}
%patch1 -p0 -b .chinese
%patch2 -p1 -b .tools64
%patch108 -p1 -b .conf
%files -n %{wine}-devel
%{_libdir}/%{name}/*.a
%{_libdir}/libwine*.so
%{_libdir}/%{name}/*.def
%{_includedir}/*
# %{_bindir}/fnt2bdf
%{_bindir}/wmc
%{_bindir}/wrc
%{_bindir}/winebuild
%{_bindir}/winegcc
%{_bindir}/wineg++
%{_bindir}/winecpp
%{_bindir}/widl
%{_bindir}/winedbg
%{_bindir}/winemaker
%{_bindir}/winedump
%{_mandir}/man1/wmc.1*
%{_mandir}/man1/wrc.1*
%{_mandir}/man1/winebuild.1*
%{_mandir}/man1/winemaker.1*
%{_mandir}/man1/winedump.1*
%{_mandir}/man1/widl.1*
%{_mandir}/man1/winedbg.1*
%{_mandir}/man1/wineg++.1*
%{_mandir}/man1/winegcc.1*
%{_mandir}/pl.UTF-8/man1/wine.1*
#----------------------------------------------------------------------------
%prep
%setup -q -n %{name}-%{version}
%patch108 -p1 -b .conf
%patch200 -p1
sed -i 's,@MDKVERSION@,%{mdkversion},' dlls/ntdll/server.c
%build
%ifarch %ix86
%ifarch %{ix86}
# (Anssi 04/2008) bug #39604
# Some protection systems complain "debugger detected" with our
# -fomit-frame-pointer flag, so disable it.
@ -243,8 +254,7 @@ export CFLAGS="%{optflags} -fno-omit-frame-pointer"
export ICOTOOL=false
autoreconf
%configure2_5x --with-x \
--with-pulse \
%configure2_5x --with-pulse \
--without-nas \
%ifarch x86_64
--enable-win64
@ -254,9 +264,11 @@ autoreconf
%make
%install
rm -rf %{buildroot}
%makeinstall_std LDCONFIG=/bin/true
install -m 0755 %{SOURCE11} %{buildroot}%{_bindir}/
install -m 0755 %{SOURCE12} %{buildroot}%{_bindir}/
# Danny: dirty:
# install -m755 tools/fnt2bdf -D %{buildroot}%{_bindir}/fnt2bdf
@ -403,6 +415,8 @@ EOF
%{_bindir}/winepath
%{_bindir}/regsvr32
%{_bindir}/winefile
%{_bindir}/winetricks
%{_bindir}/wisotool
%{_mandir}/man1/wine.1*
%lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
%lang(de) %{_mandir}/de.UTF-8/man1/winemaker.1*
@ -439,7 +453,7 @@ EOF
%{_bindir}/wine-preloader
%endif
%{_libdir}/libwine*.so.%{lib_major}*
%{_libdir}/libwine*.so.%{major}*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.cpl.so
%{_libdir}/%{name}/*.drv.so
@ -456,34 +470,3 @@ EOF
%{_libdir}/%{name}/*.sys.so
%{_libdir}/%{name}/fakedlls
%files -n %{wine}-devel
%{_libdir}/%{name}/*.a
%{_libdir}/libwine*.so
%{_libdir}/%{name}/*.def
%{_includedir}/*
# %{_bindir}/fnt2bdf
%{_bindir}/wmc
%{_bindir}/wrc
%{_bindir}/winebuild
%{_bindir}/winegcc
%{_bindir}/wineg++
%{_bindir}/winecpp
%{_bindir}/widl
%{_bindir}/winedbg
%{_bindir}/winemaker
%{_bindir}/winedump
%{_mandir}/man1/wmc.1*
%{_mandir}/man1/wrc.1*
%{_mandir}/man1/winebuild.1*
%{_mandir}/man1/winemaker.1*
%{_mandir}/man1/winedump.1*
%{_mandir}/man1/widl.1*
%{_mandir}/man1/winedbg.1*
%{_mandir}/man1/wineg++.1*
%{_mandir}/man1/winegcc.1*
%{_mandir}/pl.UTF-8/man1/wine.1*
%changelog
* Mon Aug 27 2012 Alex Burmashev <alex.burmashev@rosalab.ru>
- update to stable 1.4

18196
winetricks Normal file

File diff suppressed because it is too large Load diff

9293
wisotool Normal file

File diff suppressed because it is too large Load diff