- fix icons with patch provided by Frank Dana (rhbz#997543)
- pull in mesa-dri-drivers in meta package to make direct rendering work out
  of the box (rhbz#827776)
- restart systemd binfmt handler on post/postun (rhbz#912354)
- add arabic translation to fedora desktop files provided by Mosaab Alzoubi
  (rhbz#979770)
f38
Andreas Bierfert 12 years ago
parent 27bf3546cd
commit 4787aa7f07

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Name=Windows Installer File Name=Windows Installer File
Name[ar]=مثبت حزم واين
Exec=wine %f Exec=wine %f
MimeType=application/x-ole-storage;text/mspg-legacyinfo; MimeType=application/x-ole-storage;text/mspg-legacyinfo;
Hidden=true Hidden=true

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Notepad Name=Notepad
Comment=Text Editor Comment=Text Editor
Name[ar]=مفكرة
Comment[ar]=محرر النّصوص مفكرة واين
Exec=notepad Exec=notepad
Icon=notepad Icon=notepad
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine OLE View Name=Wine OLE View
Comment=Windows OLE View Comment=Windows OLE View
Name[ar]=عارض العناصر
Comment[ar]=لعرض العناصر البيئية في واين
Exec=wine oleview Exec=wine oleview
Icon=wine Icon=wine
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Regedit Name=Regedit
Comment=Wine registry editor Comment=Wine registry editor
Name[ar]=محرر السّجل
Comment[ar]=محرر لسجلات واين
Exec=regedit Exec=regedit
Icon=regedit Icon=regedit
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine Software Uninstaller Name=Wine Software Uninstaller
Comment=Interface to uninstall software Comment=Interface to uninstall software
Name[ar]=مزيل التطبيقات من واين
Comment[ar]=واجهة إزالة التّطبيقات من واين
Exec=wine uninstaller Exec=wine uninstaller
Icon=msiexec Icon=msiexec
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine Boot Name=Wine Boot
Comment=Simulate restart Comment=Simulate restart
Name[ar]=إقلاع واين
Comment[ar]=محاكاة إعادة التشغيل لواين
Exec=wineboot Exec=wineboot
Icon=wine Icon=wine
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine Configuration Name=Wine Configuration
Comment=Interface to set wine parameters Comment=Interface to set wine parameters
Name[ar]=إعدادات واين
Comment[ar]=لوحة تحكم بمنظومة واين
Exec=winecfg Exec=winecfg
Icon=winecfg Icon=winecfg
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine File Name=Wine File
Comment=Wine File Browser Comment=Wine File Browser
Name[ar]=مدير ملفات واين
Comment[ar]=إدارة الملفات بطريقة واين
Exec=winefile Exec=winefile
Icon=winefile Icon=winefile
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=WineMine Name=WineMine
Comment=Wine Minesweeper Comment=Wine Minesweeper
Name[ar]=كانسة ألغام واين
Comment[ar]=لعبة كانسة ألغام واين
Exec=winemine Exec=winemine
Icon=winemine Icon=winemine
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine Help Name=Wine Help
Comment=Windows Help Browser Comment=Windows Help Browser
Name[ar]=أداة المساعدة في واين
Comment[ar]=استعراض ملفات المساعدة بتنسيقات وندوز
Exec=wine winhlp32 Exec=wine winhlp32
Icon=winhelp Icon=winhelp
Terminal=false Terminal=false

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Wine Wordpad Name=Wine Wordpad
Comment=Text Editor Comment=Text Editor
Name[ar]=دفتر واين
Comment[ar]=محرر النّصوص دفتر واين
Exec=wine wordpad Exec=wine wordpad
Icon=wordpad Icon=wordpad
Terminal=false Terminal=false

@ -4,7 +4,7 @@
Name: wine Name: wine
Version: 1.7.1 Version: 1.7.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: A compatibility layer for windows applications Summary: A compatibility layer for windows applications
Group: Applications/Emulators Group: Applications/Emulators
@ -153,6 +153,7 @@ Requires: mingw32-wine-gecko = %winegecko
Requires: wine-mono = %winemono Requires: wine-mono = %winemono
%endif %endif
# Requires: samba-winbind-clients(x86-32) wait for rhbz#968860 # Requires: samba-winbind-clients(x86-32) wait for rhbz#968860
Requires: mesa-dri-drivers(x86-32)
%endif %endif
%ifarch %{ix86} %ifarch %{ix86}
@ -177,6 +178,7 @@ Requires: mingw64-wine-gecko = %winegecko
Requires: wine-mono = %winemono Requires: wine-mono = %winemono
%endif %endif
# Requires: samba-winbind-clients(x86-64) wait for rhbz#968860 # Requires: samba-winbind-clients(x86-64) wait for rhbz#968860
Requires: mesa-dri-drivers(x86-64)
Requires: wine-wow(x86-64) = %{version}-%{release} Requires: wine-wow(x86-64) = %{version}-%{release}
Conflicts: wine-wow(x86-32) = %{version}-%{release} Conflicts: wine-wow(x86-32) = %{version}-%{release}
%endif %endif
@ -191,6 +193,8 @@ Requires: wine-twain = %{version}-%{release}
Requires: wine-pulseaudio = %{version}-%{release} Requires: wine-pulseaudio = %{version}-%{release}
Requires: wine-openal = %{version}-%{release} Requires: wine-openal = %{version}-%{release}
Requires: wine-wow = %{version}-%{release} Requires: wine-wow = %{version}-%{release}
Requires: mesa-dri-drivers
Requires: samba-winbind-clients
%endif %endif
%description %description
@ -284,6 +288,8 @@ Summary: Systemd config for the wine binfmt handler
Group: Applications/Emulators Group: Applications/Emulators
Requires: systemd >= 23 Requires: systemd >= 23
BuildArch: noarch BuildArch: noarch
Requires(post): systemd
Requires(postun): systemd
%description systemd %description systemd
Register the wine binary handler for windows executables via systemd binfmt Register the wine binary handler for windows executables via systemd binfmt
@ -606,41 +612,52 @@ mkdir -p %{buildroot}%{_datadir}/wine/mono
%if 0%{?fedora} > 10 %if 0%{?fedora} > 10
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
# This replacement masks a composite program icon .SVG down
# so that only its full-size scalable icon is visible
PROGRAM_ICONFIX='s/height="272"/height="256"/;'\
's/width="632"/width="256"\n'\
' x="368"\n'\
' y="8"\n'\
' viewBox="368, 8, 256, 256"/;'
# This icon file is still in the legacy format
install -p -m 644 dlls/user32/resources/oic_winlogo.svg \ install -p -m 644 dlls/user32/resources/oic_winlogo.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wine.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wine.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wine.svg sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wine.svg
# The rest come from programs/, and contain larger scalable icons
# with a new layout that requires the PROGRAM_ICONFIX sed adjustment
install -p -m 644 programs/notepad/notepad.svg \ install -p -m 644 programs/notepad/notepad.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/notepad.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/notepad.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/notepad.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/notepad.svg
install -p -m 644 programs/regedit/regedit.svg \ install -p -m 644 programs/regedit/regedit.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/regedit.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/regedit.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/regedit.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/regedit.svg
install -p -m 644 programs/msiexec/msiexec.svg \ install -p -m 644 programs/msiexec/msiexec.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/msiexec.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/msiexec.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/msiexec.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/msiexec.svg
install -p -m 644 programs/winecfg/winecfg.svg \ install -p -m 644 programs/winecfg/winecfg.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winecfg.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winecfg.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winecfg.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winecfg.svg
install -p -m 644 programs/winefile/winefile.svg \ install -p -m 644 programs/winefile/winefile.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winefile.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winefile.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winefile.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winefile.svg
install -p -m 644 programs/winemine/winemine.svg \ install -p -m 644 programs/winemine/winemine.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winemine.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winemine.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winemine.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winemine.svg
install -p -m 644 programs/winhlp32/winhelp.svg \ install -p -m 644 programs/winhlp32/winhelp.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winhelp.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winhelp.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winhelp.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/winhelp.svg
install -p -m 644 programs/wordpad/wordpad.svg \ install -p -m 644 programs/wordpad/wordpad.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg
sed -i -e '3s/368/64/' %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg
%endif %endif
@ -775,6 +792,14 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del wine /sbin/chkconfig --del wine
fi fi
%post systemd
/bin/systemctl try-restart systemd-binfmt.service
%postun systemd
if [$1 -eq 0]; then
/bin/systemctl try-restart systemd-binfmt.service
fi
%post desktop %post desktop
update-desktop-database &>/dev/null || : update-desktop-database &>/dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -1533,6 +1558,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Sat Aug 31 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.7.1-2
- fix icons with patch provided by Frank Dana (rhbz#997543)
- pull in mesa-dri-drivers in meta package to make direct rendering work out
of the box (rhbz#827776)
- restart systemd binfmt handler on post/postun (rhbz#912354)
- add arabic translation to fedora desktop files provided by Mosaab Alzoubi
(rhbz#979770)
* Sat Aug 31 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> * Sat Aug 31 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.7.1-1 - 1.7.1-1
- version upgrade - version upgrade

Loading…
Cancel
Save