rpms
/
wine
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added conditionalized option to build with compholio-patchset for pipelight

Browse Source 
Source900 -- compholio-patchset, wine-arial-fonts sub-package,
BR: libattr-devel and configure --with-xattr for Silverlight DRM-stuff
whitespace cleanup
f38
Björn Esser 11 years ago
parent 3afa139b0c
commit a401ea3e98
3 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -2,3 +2,4 @@
/wine-1.6.1.tar.bz2
/wine-1.7.22.tar.bz2
/wine-1.7.22.tar.bz2.sign
/wine-compholio-1.7.22.tar.gz

1
sources
Unescape View File

@ -1,2 +1,3 @@
519319364b0845ffcbeade4a5b98c0d4 wine-1.7.22.tar.bz2
549fdcc146646582e5422e370e95ee7f wine-1.7.22.tar.bz2.sign
fa9f6012ec3c2ce9162fb40dd6a063c2 wine-compholio-1.7.22.tar.gz

71
wine.spec
Unescape View File

@ -3,9 +3,13 @@
%global winemono 4.5.2
#global _default_patch_fuzz 2
# build with compholio-patches, see: http://www.compholio.com/wine-compholio/
# uncomment to enable; comment-out to disable.
%global compholio 1
Name: wine
Version: 1.7.22
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A compatibility layer for windows applications
Group: Applications/Emulators
@ -52,6 +56,11 @@ Source502: wine-README-tahoma
Patch511: wine-cjk.patch
# wine compholio patches for pipelight.
# pulseaudio-patch is covered by that patch-set, too.
%if 0%{?compholio}
Source900: https://github.com/compholio/wine-compholio-daily/archive/v%{version}.tar.gz#/wine-compholio-%{version}.tar.gz
%else # 0%{?compholio}
## winepulse backend
# http://repo.or.cz/w/wine/multimedia.git
# Fri, 31 Jan 2014 10:37:53 +0000
@ -63,6 +72,7 @@ Patch511: wine-cjk.patch
# git format-patch -k --stdout 773bf038fd47159d18f8d996bdae2435aaa31f7e~..ba0286680493a48c6795ab8a20a70618ba2ef403 >> ~/cvs/fedora/rpms/wine/wine-pulse-1.7.11.patch
Patch1001: wine-pulse-1.7.11.patch
%endif # 0%{?compholio}
%if !%{?no64bit}
ExclusiveArch: %{ix86} x86_64 %{arm}
@ -125,6 +135,11 @@ BuildRequires: prelink
BuildRequires: gettext-devel
BuildRequires: chrpath
# Silverlight DRM-stuff needs XATTR enabled.
%if 0%{?compholio}
BuildRequires: libattr-devel
%endif # 0%{?compholio}
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildRequires: openal-soft-devel
BuildRequires: icoutils
@ -196,6 +211,12 @@ Requires: mesa-dri-drivers
Requires: samba-winbind-clients
%endif
# vitual Provides for claiming the presence of compholio-patchset.
%if 0%{?compholio}
Provides: %{name}(compholio) = %{version}-%{release}
%{?_isa:Provides: %{name}(compholio)%{?_isa} = %{version}-%{release}}
%endif # 0%{?compholio}
%description
Wine as a compatibility layer for UNIX to run Windows applications. This
package includes a program loader, which allows unmodified Windows
@ -356,6 +377,12 @@ handler service.
Summary: Wine font files
Group: Applications/Emulators
BuildArch: noarch
# arial-fonts are available with compholio-patchset, only.
%if 0%{?compholio}
Requires: wine-arial-fonts = %{version}-%{release}
%else # 0%{?compholio}
Obsoletes: wine-arial-fonts <= %{version}-%{release}
%endif # 0%{?compholio}
Requires: wine-courier-fonts = %{version}-%{release}
Requires: wine-fixedsys-fonts = %{version}-%{release}
Requires: wine-small-fonts = %{version}-%{release}
@ -374,6 +401,17 @@ Requires: liberation-narrow-fonts
%description fonts
%{summary}
%if 0%{?compholio}
%package arial-fonts
Summary: Wine Arial font family
Group: User Interface/X
BuildArch: noarch
Requires: fontpackages-filesystem
%description arial-fonts
%{summary}
%endif # 0%{?compholio}
%package courier-fonts
Summary: Wine Courier font family
Group: User Interface/X
@ -544,12 +582,22 @@ This package adds an openal driver for wine.
%prep
%setup -q
%patch511 -p1 -b.cjk
# setup and apply compholio-patches or pulseaudio-patch.
%if 0%{?compholio}
gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
%{__make} -C patches DESTDIR="`pwd`" install
# fix parallelized build
sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in
%else # 0%{?compholio}
%patch1001 -p1 -b.winepulse
# already run after applying compholio-patchset
autoreconf
%endif # 0%{?compholio}
%build
# disable fortify as it breaks wine
@ -567,9 +615,10 @@ export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno
%ifarch x86_64
--enable-win64 \
%endif
%{?compholio: --with-xattr} \
--disable-tests
%{__make} TARGETFLAGS="" %{?_smp_mflags}
%{__make} %{?_smp_mflags} TARGETFLAGS=""
%install
@ -739,6 +788,11 @@ install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
# install fonts
%if 0%{?compholio}
install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-arial-fonts
mv %{buildroot}/%{_datadir}/wine/fonts/arial* %{buildroot}/%{_datadir}/fonts/wine-arial-fonts/
%endif # 0%{?compholio}
install -p -m 0755 -d %{buildroot}/%{_datadir}/fonts/wine-courier-fonts
mv %{buildroot}/%{_datadir}/wine/fonts/cou* %{buildroot}/%{_datadir}/fonts/wine-courier-fonts/
@ -1504,6 +1558,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files fonts
# meta package
%if 0%{?compholio}
%files arial-fonts
%doc COPYING.LIB
%{_datadir}/fonts/wine-arial-fonts
%endif #0%{?compholio}
%files courier-fonts
%doc COPYING.LIB
%{_datadir}/fonts/wine-courier-fonts
@ -1631,6 +1691,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Sat Jul 12 2014 Björn Esser <bjoern.esser@gmail.com> - 1.7.22-2
- added conditionalized option to build with compholio-patchset for pipelight
Source900 -- compholio-patchset, wine-arial-fonts sub-package,
BR: libattr-devel and configure --with-xattr for Silverlight DRM-stuff
* Fri Jul 11 2014 Michael Cronenworth <mike@cchtml.com>
- 1.7.22-1
- version upgrade

Write Preview
Loading…
Cancel
Save