Accepting request 59295 from Emulators

Accepted submit request 59295 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/59295
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=90

susepatches.patch

@@ -1,8 +1,8 @@
 diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
-index 266c444..fd28488 100644
+index 71b8f93..8a3d721 100644
 --- a/dlls/shell32/pidl.c
 +++ b/dlls/shell32/pidl.c
-@@ -1753,13 +1753,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void)
+@@ -1755,13 +1755,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void)
  
      TRACE("\n");
  

wine-1.3.10.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2252269f2730427f65b379a1d6a183dce260e54325f141a68dbbe5e86bd69440
-size 18366233

wine-1.3.12.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f567be769d46fe172d1dea42af996038b9e8169e615ae17632cee5e204490dc9
+size 18688959

wine.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sun Jan 23 10:59:03 CET 2011 - meissner@suse.de
+
+- Updated to 1.3.12 development snapshot
+  - Support for multiple icon sizes in winemenubuilder.
+  - Improvements to the help browser.
+  - Initial stab at DOSBox integration.
+  - Various MSI fixes.
+  - Some fixes to the Wine debugger.
+  - Various bug fixes.
+- updated winetricks
+
+-------------------------------------------------------------------
+Tue Jan 11 13:20:24 CET 2011 - meissner@suse.de
+
+- one more fix for ppc build
+
+-------------------------------------------------------------------
+Fri Jan  7 20:32:21 CET 2011 - meissner@suse.de
+
+- Updated to 1.3.11 development snapshot
+  - PO files now used for translations.
+  - Various JavaScript improvements.
+  - Some fixes to the Wine debugger.
+  - Translation updates.
+  - Various bug fixes.
+
+-------------------------------------------------------------------
+Fri Jan  7 13:45:24 CET 2011 - meissner@suse.de
+
+- moved development tools into -devel package 
+
 -------------------------------------------------------------------
 Mon Jan  3 14:30:52 CET 2011 - meissner@suse.de
 

wine.spec

@@ -30,7 +30,7 @@ BuildRequires:  gstreamer-0_10-plugins-base-devel
 License:        LGPLv2.1+
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.3.10
+Version:        1.3.12
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -44,7 +44,9 @@ Source5:        ubuntuwine.tar.bz2
 # SUSE specific patches
 Patch0:         susepatches.patch
 Recommends:     wine-gecko wine-mp3
+%ifarch %ix86 x86_64
 Requires:       wine-32bit = %version
+%endif
 # for winetricks:
 Requires:       unzip cabextract
 %ifarch x86_64
@@ -176,28 +178,35 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/notepad
 /usr/bin/regedit
 /usr/bin/regsvr32
-/usr/bin/widl
 /usr/bin/wineboot
-/usr/bin/winebuild
 /usr/bin/winecfg
 /usr/bin/wineconsole
-/usr/bin/winecpp
 /usr/bin/winedbg
-/usr/bin/winedump
 /usr/bin/winefile
-/usr/bin/wineg++
-/usr/bin/winegcc
-/usr/bin/winemaker
 /usr/bin/winemine
 /usr/bin/winepath
 /usr/bin/wineserver
 /usr/bin/winetricks
 /usr/bin/wisotool
-/usr/bin/wmc
-/usr/bin/wrc
 /usr/share/wine
 /usr/share/applications/wine.desktop
-%doc %{_mandir}/*/*
+%doc %{_mandir}/man1/wine.1*
+%doc %{_mandir}/man1/winedbg.1*
+%doc %{_mandir}/man1/wineserver.1*
+%doc %{_mandir}/*/man1/wine.1*
+%doc %{_mandir}/*/man1/wineserver.1*
+%doc %{_mandir}/man1/msiexec.1.*
+%doc %{_mandir}/man1/notepad.1.*
+%doc %{_mandir}/man1/regedit.1.*
+%doc %{_mandir}/man1/regsvr32.1.*
+%doc %{_mandir}/man1/wineboot.1.*
+%doc %{_mandir}/man1/winebuild.1.*
+%doc %{_mandir}/man1/winecfg.1.*
+%doc %{_mandir}/man1/wineconsole.1.*
+%doc %{_mandir}/man1/winecpp.1.*
+%doc %{_mandir}/man1/winefile.1.*
+%doc %{_mandir}/man1/winemine.1.*
+%doc %{_mandir}/man1/winepath.1.*
 %dir /etc/xdg/menus/
 %dir /etc/xdg/menus/applications-merged
 %config /etc/xdg/menus/applications-merged/*.menu
@@ -209,31 +218,54 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/icons/hicolor/scalable/apps
 /usr/share/icons/hicolor/scalable/apps/*.svg
 
-%ifarch %ix86
 
+%if 0%{?suse_version} > 1120
+%ifarch %ix86
 %files 32bit
 %defattr(-,root,root)
+%endif
+%endif
+%ifarch %ix86
 /usr/bin/wine
 /usr/bin/wine-preloader
 %endif
+%ifarch ppc
+/usr/bin/wine
+%endif
 %ifarch x86_64
 /usr/bin/wine64
 /usr/bin/wine64-preloader
 %endif
-%ifarch ppc
-/usr/bin/wine
-%endif
-%{_libdir}/lib*
-%dir %{_libdir}/wine
 %{_libdir}/wine/*.so
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/wine
 %dir %{_libdir}/wine/fakedlls
 %{_libdir}/wine/fakedlls/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/wine
+/usr/bin/widl
+/usr/bin/winebuild
+/usr/bin/winecpp
+/usr/bin/winedump
+/usr/bin/wineg++
+/usr/bin/winegcc
+/usr/bin/winemaker
+/usr/bin/wmc
+/usr/bin/wrc
 %{_libdir}/wine/*.def
 %{_libdir}/wine/*.a
+%{_libdir}/lib*.so
+%doc %{_mandir}/man1/winemaker.1*
+%doc %{_mandir}/*/man1/winemaker.1*
+%doc %{_mandir}/man1/widl.1*
+%doc %{_mandir}/man1/winedump.1*
+%doc %{_mandir}/man1/wineg++.1*
+%doc %{_mandir}/man1/winegcc.1*
+%doc %{_mandir}/man1/wmc.1*
+%doc %{_mandir}/man1/wrc.1*
+
 # /usr/share/aclocal/wine.m4
 
 %changelog