Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2012-02-10 17:20:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2012-01-20 20:27:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2012-02-10 17:20:33.000000000 +0100 @@ -1,0 +2,40 @@ +Fri Jan 27 20:23:03 UTC 2012 - [email protected] + +- Updated to 1.4-rc1 release candidate (1.3.38_1.4rc1 for linearity) + - Improved crash dialog with support for saving the backtrace. + - Support for the Back button in built-in Internet Explorer. + - Keyboard accelerators can now be translated through po files. + - A number of installer fixes. + - Many translation updates and tweaks. + - Various bug fixes. + +------------------------------------------------------------------- +Thu Jan 26 22:00:45 UTC 2012 - [email protected] + +- autogenerate baselibs.conf + +------------------------------------------------------------------- +Mon Jan 16 17:53:20 CET 2012 - [email protected] + +- Updated to 1.3.36 development snapshot + - Completion of the DIB engine. + - Improvements to the C++ runtime. + - A number of fixes in the audio drivers. + - Unnecessary Direct3D options removed from WineCfg. + - Some fixes to the built-in Internet Explorer. + - Various bug fixes. +- packaging changed to use baselibs methods + +------------------------------------------------------------------- +Fri Dec 30 18:59:04 UTC 2011 - [email protected] + +- Updated to 1.3.36 development snapshot + - UDisks backend for the dynamic device support. + - Polygons and geometric pens implemented in the DIB engine. + - JScript now compiles entire functions. + - Improved support for vertical fonts. + - A few more scripts in UniScribe. + - A bunch of ctype functions implemented in MSVCP. + - Various bug fixes. + +------------------------------------------------------------------- @@ -4,0 +45,27 @@ + +------------------------------------------------------------------- +Sat Dec 17 10:13:32 UTC 2011 - [email protected] + +- Updated to 1.3.35 development snapshot + - Triangular gradients and cosmetic wide pens support in the DIB engine. + - All Wine dialogs can now be translated through po files. + - Many more scripts added to UniScribe. + - JScript using bytecode throughout now. + - Several MSXML improvements. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Dec 2 23:39:07 CET 2011 - [email protected] + +- Updated to 1.3.34 development snapshot + - Bytecode support in JavaScript. + - Support for gradients in the DIB engine. + - A number of Uniscribe improvements. + - Fixes for DirectDraw mode switching. + - A few more MSVC runtime functions. + - Various bug fixes. + +------------------------------------------------------------------- +Mon Nov 21 22:49:24 CET 2011 - [email protected] + +- Remove -fomit-frame-pointer again. Old: ---- susepatches.patch wine-1.3.33.tar.bz2 New: ---- baselibs.conf wine-1.4-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.nJl4Ka/_old 2012-02-10 17:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.nJl4Ka/_new 2012-02-10 17:20:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wine # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -56,34 +56,45 @@ %if 0%{?suse_version} > 1130 BuildRequires: gstreamer-0_10-plugins-base-devel %endif -Version: 1.3.33 +Version: 1.3.38_1.4rc1 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ Group: System/Emulators/PC Url: http://www.winehq.com # vanilla Wine release -Source0: wine-%version.tar.bz2 +%define winever 1.4-rc1 +Source0: wine-%{winever}.tar.bz2 Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop Source5: ubuntuwine.tar.bz2 +Source7: baselibs.conf # SUSE specific patches # - currently none, but add them here -Patch0: susepatches.patch +#Patch0: susepatches.patch Recommends: wine-gecko >= 1.4 Recommends: wine-mp3 Recommends: dosbox Conflicts: wine-gecko < 1.3 -%ifarch %ix86 x86_64 +%ifarch x86_64 Requires: wine-32bit = %version %endif # for winetricks: Requires: unzip cabextract %ifarch x86_64 Requires: libX11.so.6()(64bit) libXext.so.6()(64bit) libXcursor.so.1()(64bit) libXi.so.6()(64bit) libXxf86vm.so.1()(64bit) libXrender.so.1()(64bit) libXrandr.so.2()(64bit) libXinerama.so.1()(64bit) libXcomposite.so.1()(64bit) libGL.so.1()(64bit) libGLU.so.1()(64bit) libxslt.so.1()(64bit) libncurses.so.6()(64bit) libfreetype.so.6()(64bit) libfontconfig.so.1()(64bit) libcups.so.2()(64bit) +%else +%ifarch %ix86 +Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libncurses.so.6 libfreetype.so.6 libcrypto.so.1.0.0 libssl.so.1.0.0 libfontconfig.so.1 libcups.so.2 libpng14.so.14 +%if 0%{?suse_version} < 1210 +Requires: libgnutls.so.26 +%else +Requires: libgnutls.so.28 +%endif +%endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,45 +106,25 @@ It is not necessary to have a Windows installation to run WINE. -Refer to /usr/share/doc/packages/wine/README.SuSE. There is more +Refer to %{_datadir}/doc/packages/wine/README.SuSE. There is more documentation available in that directory. Read 'man wine' for further information. You can invoke wine by entering 'wine program.exe'. Configure it by running 'winecfg'. -%ifarch %ix86 - -%package 32bit -Summary: The 32bit runtime system of Wine -# requires either 32bit or 64bit wine -Requires: wine = %version -# lib dependencies that are dynamically loaded -Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libncurses.so.6 libfreetype.so.6 libcrypto.so.1.0.0 libssl.so.1.0.0 libfontconfig.so.1 libcups.so.2 libpng14.so.14 -%if 0%{?suse_version} < 1210 -Requires: libgnutls.so.26 -%else -Requires: libgnutls.so.28 -%endif - -%description 32bit -This package contains the 32bit runtime environment (libraries, DLLs, EXEs) of Wine. -It is required to run Win32 binaries. It requires either the 32bit or 64bit -"wine" environment to work. -%endif %package devel Summary: files for wine development +Group: System/Emulators/PC %description devel This RPM contains the header files and development tools for the WINE libraries. - - %prep -%setup -q -%patch0 -p1 +%setup -q -n %name-%winever +#%patch0 -p1 # cp %{S:3} . # @@ -141,12 +132,12 @@ %build cat VERSION %ifarch %ix86 -# e.g. Steam hates it. +# e.g. Steam and other copy protections hate removed %ebp. export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'` %endif # keep just for susepatches with configure changes -autoconf -autoheader -I include +#autoconf +#autoheader -I include CFLAGS="$RPM_OPT_FLAGS" \ %configure \ --with-x \ @@ -155,77 +146,78 @@ %endif --verbose -cat config.log grep "have_x=yes" config.log || exit 1 -grep SONAME_ config.status +# generate baselibs.conf +%ifarch %ix86 +echo "# autogenerated in .spec file" >%SOURCE7 +echo "%name" >> %SOURCE7 +echo " +^/usr/bin/wine\$" >> %SOURCE7 +echo " +^/usr/bin/wine-preloader\$" >> %SOURCE7 +echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7 +grep SONAME_ config.log +grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7 +echo "%name-devel" >> %SOURCE7 +cat %SOURCE7 +%endif make %{?jobs:-j%jobs} all %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} # install desktop file -install -d $RPM_BUILD_ROOT/usr/share/applications/ +install -d %{buildroot}%{_datadir}/applications/ %suse_update_desktop_file %{SOURCE4} Emulator -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ -install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ -install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ -mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de -mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr -mv $RPM_BUILD_ROOT/%{_mandir}/pl.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/pl +install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/ +install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/ +install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/ +mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de +mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr +mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl tar xjf %{SOURCE5} # Copied from Ubuntu Wine out of debian.diff # https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages # taken on 1.2rc2 time. cd ubuntuwine - install -d $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - install -c -m 644 wine.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + install -d %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged + install -c -m 644 wine.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged # Install application-specific desktop files - install -d $RPM_BUILD_ROOT/usr/share/applications - install -c -m 644 *.desktop $RPM_BUILD_ROOT/usr/share/applications/ + install -d %{buildroot}%{_datadir}/applications + install -c -m 644 *.desktop %{buildroot}%{_datadir}/applications/ - install -d $RPM_BUILD_ROOT/usr/share/desktop-directories/ - install -c -m 644 *.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/ + install -d %{buildroot}%{_datadir}/desktop-directories/ + install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/ # Install icons - install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/ - install -c -m 644 *.svg $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/ + install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ + install -c -m 644 *.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ cd .. -%fdupes -s $RPM_BUILD_ROOT - -%ifarch %ix86 - -%post 32bit -p /sbin/ldconfig - -%postun 32bit -p /sbin/ldconfig -%else +%fdupes -s %{buildroot} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig -%endif %files %defattr(-,root,root) %doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* -/usr/bin/function_grep.pl -/usr/bin/msiexec -/usr/bin/notepad -/usr/bin/regedit -/usr/bin/regsvr32 -/usr/bin/wineboot -/usr/bin/winecfg -/usr/bin/wineconsole -/usr/bin/winedbg -/usr/bin/winefile -/usr/bin/winemine -/usr/bin/winepath -/usr/bin/wineserver -/usr/bin/winetricks -/usr/bin/wisotool -/usr/share/wine -/usr/share/applications/wine.desktop +%{_bindir}/function_grep.pl +%{_bindir}/msiexec +%{_bindir}/notepad +%{_bindir}/regedit +%{_bindir}/regsvr32 +%{_bindir}/wineboot +%{_bindir}/winecfg +%{_bindir}/wineconsole +%{_bindir}/winedbg +%{_bindir}/winefile +%{_bindir}/winemine +%{_bindir}/winepath +%{_bindir}/wineserver +%{_bindir}/winetricks +%{_bindir}/wisotool +%{_datadir}/wine +%{_datadir}/applications/wine.desktop %doc %{_mandir}/man1/wine.1* %doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/wineserver.1* @@ -245,34 +237,26 @@ %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 -/usr/share/applications/*.desktop -%dir /usr/share/desktop-directories/ -/usr/share/desktop-directories/*.directory -%dir /usr/share/icons/hicolor -%dir /usr/share/icons/hicolor/scalable -%dir /usr/share/icons/hicolor/scalable/apps -/usr/share/icons/hicolor/scalable/apps/*.svg - -%if 0%{?suse_version} > 1120 -%ifarch %ix86 - -%files 32bit -%defattr(-,root,root) -%endif -%endif +%dir %{_sysconfdir}/xdg/menus/ +%dir %{_sysconfdir}/xdg/menus/applications-merged +%config %{_sysconfdir}/xdg/menus/applications-merged/*.menu +%{_datadir}/applications/*.desktop +%dir %{_datadir}/desktop-directories/ +%{_datadir}/desktop-directories/*.directory +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/scalable +%dir %{_datadir}/icons/hicolor/scalable/apps +%{_datadir}/icons/hicolor/scalable/apps/*.svg %ifarch %ix86 -/usr/bin/wine -/usr/bin/wine-preloader +%{_bindir}/wine +%{_bindir}/wine-preloader %endif %ifarch ppc -/usr/bin/wine +%{_bindir}/wine %endif %ifarch x86_64 -/usr/bin/wine64 -/usr/bin/wine64-preloader +%{_bindir}/wine64 +%{_bindir}/wine64-preloader %endif %{_libdir}/wine/*.so %{_libdir}/lib*.so.* @@ -283,15 +267,15 @@ %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 +%{_bindir}/widl +%{_bindir}/winebuild +%{_bindir}/winecpp +%{_bindir}/winedump +%{_bindir}/wineg++ +%{_bindir}/winegcc +%{_bindir}/winemaker +%{_bindir}/wmc +%{_bindir}/wrc %{_libdir}/wine/*.def %{_libdir}/wine/*.a %{_libdir}/lib*.so @@ -304,6 +288,6 @@ %doc %{_mandir}/man1/wmc.1* %doc %{_mandir}/man1/wrc.1* -# /usr/share/aclocal/wine.m4 +# %{_datadir}/aclocal/wine.m4 %changelog ++++++ baselibs.conf ++++++ wine +^/usr/bin/wine$ +^/usr/bin/wine-preloader$ requires "libX11.so.6" requires "libXext.so.6" requires "libXcursor.so.1" requires "libXi.so.6" requires "libXxf86vm.so.1" requires "libXrender.so.1" requires "libXrandr.so.2" requires "libXinerama.so.1" requires "libXcomposite.so.1" requires "libGL.so.1" requires "libGLU.so.1" wine-devel ++++++ winetricks ++++++ ++++ 1741 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/wine/winetricks ++++ and /work/SRC/openSUSE:Factory/.wine.new/winetricks -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
