[wine] 1.7.1-2
Andreas Bierfert
awjb at fedoraproject.org
Sun Sep 1 13:42:26 UTC 2013
commit 4787aa7f0706b2aaa27d6382f35f6de15601f801
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Sun Sep 1 15:42:12 2013 +0200
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)
wine-mime-msi.desktop | 1 +
wine-notepad.desktop | 2 +
wine-oleview.desktop | 2 +
wine-regedit.desktop | 2 +
wine-uninstaller.desktop | 2 +
wine-wineboot.desktop | 2 +
wine-winecfg.desktop | 2 +
wine-winefile.desktop | 2 +
wine-winemine.desktop | 4 ++-
wine-winhelp.desktop | 2 +
wine-wordpad.desktop | 2 +
wine.spec | 52 ++++++++++++++++++++++++++++++++++++++--------
12 files changed, 65 insertions(+), 10 deletions(-)
---
diff --git a/wine-mime-msi.desktop b/wine-mime-msi.desktop
index 5dcaa46..60e7bef 100644
--- a/wine-mime-msi.desktop
+++ b/wine-mime-msi.desktop
@@ -1,6 +1,7 @@
[Desktop Entry]
Type=Application
Name=Windows Installer File
+Name[ar]=مثبت حزم واين
Exec=wine %f
MimeType=application/x-ole-storage;text/mspg-legacyinfo;
Hidden=true
diff --git a/wine-notepad.desktop b/wine-notepad.desktop
index cfaf6b4..b8af5b9 100644
--- a/wine-notepad.desktop
+++ b/wine-notepad.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Notepad
Comment=Text Editor
+Name[ar]=مفكرة
+Comment[ar]=محرر النّصوص مفكرة واين
Exec=notepad
Icon=notepad
Terminal=false
diff --git a/wine-oleview.desktop b/wine-oleview.desktop
index 8f94f38..d30f78f 100644
--- a/wine-oleview.desktop
+++ b/wine-oleview.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine OLE View
Comment=Windows OLE View
+Name[ar]=عارض العناصر
+Comment[ar]=لعرض العناصر البيئية في واين
Exec=wine oleview
Icon=wine
Terminal=false
diff --git a/wine-regedit.desktop b/wine-regedit.desktop
index 5fddbf4..c39cfa0 100644
--- a/wine-regedit.desktop
+++ b/wine-regedit.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Regedit
Comment=Wine registry editor
+Name[ar]=محرر السّجل
+Comment[ar]=محرر لسجلات واين
Exec=regedit
Icon=regedit
Terminal=false
diff --git a/wine-uninstaller.desktop b/wine-uninstaller.desktop
index 2a9cf52..6087726 100644
--- a/wine-uninstaller.desktop
+++ b/wine-uninstaller.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
+Name[ar]=مزيل التطبيقات من واين
+Comment[ar]=واجهة إزالة التّطبيقات من واين
Exec=wine uninstaller
Icon=msiexec
Terminal=false
diff --git a/wine-wineboot.desktop b/wine-wineboot.desktop
index 1ecba53..9796c13 100644
--- a/wine-wineboot.desktop
+++ b/wine-wineboot.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine Boot
Comment=Simulate restart
+Name[ar]=إقلاع واين
+Comment[ar]=محاكاة إعادة التشغيل لواين
Exec=wineboot
Icon=wine
Terminal=false
diff --git a/wine-winecfg.desktop b/wine-winecfg.desktop
index 44b13c2..6204af2 100644
--- a/wine-winecfg.desktop
+++ b/wine-winecfg.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
+Name[ar]=إعدادات واين
+Comment[ar]=لوحة تحكم بمنظومة واين
Exec=winecfg
Icon=winecfg
Terminal=false
diff --git a/wine-winefile.desktop b/wine-winefile.desktop
index 855dcbf..d87955b 100644
--- a/wine-winefile.desktop
+++ b/wine-winefile.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
+Name[ar]=مدير ملفات واين
+Comment[ar]=إدارة الملفات بطريقة واين
Exec=winefile
Icon=winefile
Terminal=false
diff --git a/wine-winemine.desktop b/wine-winemine.desktop
index 34712f9..a7816de 100644
--- a/wine-winemine.desktop
+++ b/wine-winemine.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=WineMine
-Comment=Wine Minesweeper
+Comment=Wine Minesweeper
+Name[ar]=كانسة ألغام واين
+Comment[ar]=لعبة كانسة ألغام واين
Exec=winemine
Icon=winemine
Terminal=false
diff --git a/wine-winhelp.desktop b/wine-winhelp.desktop
index 2752518..db97819 100644
--- a/wine-winhelp.desktop
+++ b/wine-winhelp.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine Help
Comment=Windows Help Browser
+Name[ar]=أداة المساعدة في واين
+Comment[ar]=استعراض ملفات المساعدة بتنسيقات وندوز
Exec=wine winhlp32
Icon=winhelp
Terminal=false
diff --git a/wine-wordpad.desktop b/wine-wordpad.desktop
index 1fe4ecd..032fdbc 100644
--- a/wine-wordpad.desktop
+++ b/wine-wordpad.desktop
@@ -1,6 +1,8 @@
[Desktop Entry]
Name=Wine Wordpad
Comment=Text Editor
+Name[ar]=دفتر واين
+Comment[ar]=محرر النّصوص دفتر واين
Exec=wine wordpad
Icon=wordpad
Terminal=false
diff --git a/wine.spec b/wine.spec
index 0f2684b..2620450 100644
--- a/wine.spec
+++ b/wine.spec
@@ -4,7 +4,7 @@
Name: wine
Version: 1.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A compatibility layer for windows applications
Group: Applications/Emulators
@@ -153,6 +153,7 @@ Requires: mingw32-wine-gecko = %winegecko
Requires: wine-mono = %winemono
%endif
# Requires: samba-winbind-clients(x86-32) wait for rhbz#968860
+Requires: mesa-dri-drivers(x86-32)
%endif
%ifarch %{ix86}
@@ -177,6 +178,7 @@ Requires: mingw64-wine-gecko = %winegecko
Requires: wine-mono = %winemono
%endif
# Requires: samba-winbind-clients(x86-64) wait for rhbz#968860
+Requires: mesa-dri-drivers(x86-64)
Requires: wine-wow(x86-64) = %{version}-%{release}
Conflicts: wine-wow(x86-32) = %{version}-%{release}
%endif
@@ -191,6 +193,8 @@ Requires: wine-twain = %{version}-%{release}
Requires: wine-pulseaudio = %{version}-%{release}
Requires: wine-openal = %{version}-%{release}
Requires: wine-wow = %{version}-%{release}
+Requires: mesa-dri-drivers
+Requires: samba-winbind-clients
%endif
%description
@@ -284,6 +288,8 @@ Summary: Systemd config for the wine binfmt handler
Group: Applications/Emulators
Requires: systemd >= 23
BuildArch: noarch
+Requires(post): systemd
+Requires(postun): systemd
%description systemd
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
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 \
%{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 \
%{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 \
%{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 \
%{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 \
%{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 \
%{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 \
%{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 \
%{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 \
%{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
@@ -775,6 +792,14 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del wine
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
update-desktop-database &>/dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -1534,6 +1559,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%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>
- 1.7.1-1
- version upgrade
- build with lcms2
More information about the scm-commits
mailing list