From 4b15cd57db0942bbe89b0e30f48f034888213b54458185559ad04098785e3656 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 9 Jul 2009 09:30:40 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=61

---
 wine-1.1.24.tar.bz2 |  3 ---
 wine-1.1.25.tar.bz2 |  3 +++
 wine.changes        | 13 +++++++++++++
 wine.spec           | 43 ++++++++++++++++++-------------------------
 4 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 wine-1.1.24.tar.bz2
 create mode 100644 wine-1.1.25.tar.bz2

diff --git a/wine-1.1.24.tar.bz2 b/wine-1.1.24.tar.bz2
deleted file mode 100644
index a369e73..0000000
--- a/wine-1.1.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbe8d15a18151d9cd4c77b5c0c031beec7eb3795e16f02ffabfc12de984c723d
-size 15455581
diff --git a/wine-1.1.25.tar.bz2 b/wine-1.1.25.tar.bz2
new file mode 100644
index 0000000..05c118a
--- /dev/null
+++ b/wine-1.1.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acd26b4f7621a7ebe0583fb9972fcf925e20330e0e9fa148fada02d96d487015
+size 15554961
diff --git a/wine.changes b/wine.changes
index 39a6955..5add92b 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jul  4 12:58:33 CEST 2009 - meissner@novell.com
+
+- spec file cleanup, make it possible to rpmbuild -ba
+  on x86_64 machines. bnc#519192  
+- Updated to upstream 1.1.25
+  - A ton of translation updates.
+  - Support for various Unicode file encodings in Notepad.
+  - Improved memory management, especially for OpenGL.
+  - Desktop menus now cleaned up automatically.
+  - Beginnings of a windowscodecs DLL implementation.
+  - Various bug fixes.
+
 -------------------------------------------------------------------
 Sun Jun 21 22:35:23 CEST 2009 - meissner@suse.de
 
diff --git a/wine.spec b/wine.spec
index c627113..90d0c16 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package wine (Version 1.1.24)
+# spec file for package wine (Version 1.1.25)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,7 +23,7 @@ BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils
 License:        LGPL v2.1 or later
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.1.24
+Version:        1.1.25
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -73,24 +73,18 @@ test -d dlls/winemp3.acm && (
 )
 
 %build
-rm -f ./config.cache
-autoconf
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr --verbose
+cat VERSION
+CFLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m64//'` \
+./configure --prefix=/usr --libdir=/usr/lib --with-x --verbose
+grep "have_x=yes" config.log || exit 1
+make %{?jobs:-j%jobs} depend
 make %{?jobs:-j%jobs} all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT%{_prefix}
-#
-# install documentation
-install -d -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
-cp ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* \
-   $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
-#
-find $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -type d|xargs chmod ogu+rx
-find $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -type f|xargs chmod ogu+r
+make install DESTDIR=$RPM_BUILD_ROOT
+# install desktop file
+install -d $RPM_BUILD_ROOT/usr/share/applications/
+install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/
 install -m 0755 %SOURCE1 $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
@@ -106,22 +100,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* 
 /usr/bin/*
 /usr/share/wine
-%{_libdir}/lib*
-%dir %{_libdir}/wine
-%{_libdir}/wine/*.so
-%{_libdir}/wine/*.*16
+/usr/lib/lib*
+%dir /usr/lib/wine
+/usr/lib/wine/*.so
+/usr/lib/wine/*.*16
 /usr/share/applications/wine.desktop
-%doc %{_defaultdocdir}/wine
 %doc %{_mandir}/*/*
-%doc %{_mandir}/*/*/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/wine
-%{_libdir}/wine/*.def
-%{_libdir}/wine/*.a
+/usr/lib/wine/*.def
+/usr/lib/wine/*.a
 /usr/share/aclocal/wine.m4
 
 %changelog