diff --git a/wine.spec b/wine.spec index 17b6a0a..691ff66 100644 --- a/wine.spec +++ b/wine.spec @@ -1,10 +1,11 @@ %define _use_internal_dependency_generator 1 %define wine_gecko_ver 2.40 -%define wine_mono_ver 4.5.6 -%define WINE_GECKO_CHECKED_FOR_VERSION 1.8 +%define wine_mono_ver 4.6.2 +%define WINE_GECKO_CHECKED_FOR_VERSION 1.8.1 %define wine_patchset_date 20140427 +%define wine_staging_ver %{version}-unofficial Name: wine -Version: 1.8 +Version: 1.8.1 Release: 1mamba Epoch: 3 Summary: An open source implementation of the Windows API on top of X and Unix @@ -14,6 +15,7 @@ Distribution: openmamba Packager: Davide Madrisan URL: http://www.winehq.org Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-%{version}.tar.bz2 +Source100: https://github.com/wine-compholio/wine-staging.git/v%{wine_staging_ver}/wine-staging-%{version}.tar.bz2 Source1: wine-systemd-32 Source2: wine-systemd-64 Source3: wine_hidden_kde-desktop @@ -35,7 +37,8 @@ Source21: wine-ldconfig-64 Source30: http://downloads.sourceforge.net/project/wine/Wine%20Gecko/%{wine_gecko_ver}/wine_gecko-%{wine_gecko_ver}-x86.msi Source31: http://downloads.sourceforge.net/project/wine/Wine%20Gecko/%{wine_gecko_ver}/wine_gecko-%{wine_gecko_ver}-x86_64.msi # see: http://wiki.winehq.org/Mono -Source40: http://downloads.sourceforge.net/project/wine/Wine%20Mono/%{wine_mono_ver}/wine-mono-%{wine_mono_ver}.tar.gz +Source40: http://dl.winehq.org/wine/wine-mono/%{wine_mono_ver}/wine-mono-%{wine_mono_ver}.msi +#Source40: http://downloads.sourceforge.net/project/wine/Wine%20Mono/%{wine_mono_ver}/wine-mono-%{wine_mono_ver}.tar.gz # pipelight patchset, see http://fds-team.de/cms/pipelight-compile-wine.html #Source41: http://fds-team.de/mirror/wine-patches-minimal-%{version}.tar.gz Source42: wine-autoupdate @@ -188,10 +191,14 @@ Header, include files and library definition files for developing applications w echo "http://sourceforge.net/projects/wine/files/Wine%20Gecko/" exit 1 %endif -%patch2 -p1 -%ifarch %{ix86} -cat patches/*.patch | patch -p1 -%endif +#%patch2 -p1 + +tar xvf %{SOURCE100} --strip-components 1 +./patches/patchinstall.sh DESTDIR="$(pwd)" --all + +#%ifarch %{ix86} +#cat patches/*.patch | patch -p1 +#%endif %build #:<< _EOF @@ -199,6 +206,8 @@ cat patches/*.patch | patch -p1 --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir}/wine \ --with-x \ + --with-gstreamer \ + --with-xattr \ %ifarch x86_64 --enable-win64 %endif @@ -383,6 +392,7 @@ exit 0 %files common %defattr(-,root,root) +%{_bindir}/msidb %{_bindir}/msiexec %{_bindir}/notepad %{_bindir}/regedit @@ -402,7 +412,7 @@ exit 0 %dir %{_datadir}/wine/gecko %{_datadir}/wine/gecko/wine_gecko-*.msi %dir %{_datadir}/wine/mono -%{_datadir}/wine/mono/wine-mono-%{wine_mono_ver}.tar.gz +%{_datadir}/wine/mono/wine-mono-*.msi %{_mandir}/man1/msiexec.1* %{_mandir}/man1/notepad.1* %{_mandir}/man1/regedit.1* @@ -418,12 +428,6 @@ exit 0 %{_mandir}/de.UTF-8/man1/wineserver.1* %{_mandir}/fr.UTF-8/man1/wineserver.1* - -#%{_mandir}/man?/* -#%{_mandir}/de.UTF-8/man1/wine* -#%{_mandir}/fr.UTF-8/man1/wine* -#%{_mandir}/pl.UTF-8/man1/wine* - %files fonts %defattr(-,root,root) %{_datadir}/wine/fonts/*.fon @@ -492,12 +496,16 @@ exit 0 %doc documentation/README.* %changelog +* Thu Apr 07 2016 Silvan Calarco 1.8.1-1mamba +- update to 1.8.1 +- fixed wine-mono msi installation + +* Tue Apr 05 2016 Silvan Calarco 1.8-2mamba +- rebuilt as wine-staging + * Fri Jan 29 2016 Automatic Build System 1.8-1mamba - automatic version update by autodist -* Mon Oct 12 2015 Silvan Calarco 1.7.52-2mamba -- ... add a changelog entry - * Mon Oct 12 2015 Automatic Build System 1.7.52-1mamba - automatic version update by autodist