new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1718 ec354946-7b23-47d6-9f5a-488ba84defc7

w/wine/wine-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_major_version 1.2
 %define pkg_name wine
-%define pkg_release 1.rc2%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 # NEW Release: numbering rule. -- Release: 1%{?_dist_release} 
 # spec file for package wine.. # base (SUSE10 and fedora core 9)
@@ -15,12 +15,12 @@ License:	LGPLv2+
 Group:	        Applications/System
 
 #--------------------------------------------------------------------
-Source0: http://prdownloads.sourceforge.net/wine/%{name}-%{version}-rc2.tar.bz2
+Source0: http://prdownloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
 #--------------------------------------------------------------------
 
 Source1:	wine.init
-Source3:    wine-README-Fedora
-Source4:    wine-32.conf
+Source3:	wine-README-Fedora
+Source4:	wine-32.conf
 # desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
@@ -69,6 +69,8 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, Takemikaduchi
 
+ExclusiveArch: %{ix86} x86_64
+
 #--------------------------------------------------------------------
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 #--------------------------------------------------------------------
@@ -115,6 +117,36 @@ BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
 BuildRequires:  freetype2-devel
 
+%ifarch x86_64
+BuildRequires: compat32-glibc-devel
+BuildRequires: compat32-glibc-devel
+BuildRequires: compat32-libX11-devel
+BuildRequires: compat32-libxcb-devel
+BuildRequires: compat32-freetype2-devel
+BuildRequires: compat32-libSM-devel
+BuildRequires: compat32-libXext-devel
+BuildRequires: compat32-libXrender-devel
+BuildRequires: compat32-mesa-libGL-devel
+BuildRequires: compat32-mesa-libGLU-devel
+BuildRequires: compat32-libxml2-devel
+BuildRequires: compat32-libxslt-devel
+BuildRequires: compat32-openssl-devel
+BuildRequires: compat32-libjpeg-devel
+BuildRequires: compat32-libpng-devel
+BuildRequires: compat32-zlib-devel
+## extension
+BuildRequires: compat32-libXcursor-devel
+BuildRequires: compat32-libXi-devel
+BuildRequires: compat32-libXxf86vm-devel
+BuildRequires: compat32-libXrandr-devel
+BuildRequires: compat32-libXinerama-devel
+BuildRequires: compat32-libXcomposite-devel
+BuildRequires: compat32-ncurses-devel
+BuildRequires: compat32-fontconfig-devel
+BuildRequires: compat32-libtiff-devel
+BuildRequires: compat32-openldap-devel
+%endif
+
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service
 Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -197,7 +229,7 @@ Of course, please be mindful of security.
 
 %prep
 
-%setup -q -n %{name}-%{version}-rc2
+%setup -q -n %{name}-%{version}
 ## %patch0
 %patch1 -p1
 ## %patch400 -p1
@@ -207,12 +239,22 @@ Of course, please be mindful of security.
 
 %build
 
+%ifarch x86_64
+export CFLAGS="-O2 -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables -fno-strict-aliasing -fno-schedule-insns2"
+./configure \
+	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
+	--with-x \
+	--without-jack \
+	--without-capi
+%else
 export CFLAGS="$RPM_OPT_FLAGS"
 %{configure} \
 	--prefix=%{_prefix} \
 	--with-x \
 	--without-jack \
 	--without-capi
+%endif
 
 grep "have_x=yes" config.log || exit 1
 
@@ -222,8 +264,7 @@ grep "have_x=yes" config.log || exit 1
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%{__make} prefix=${RPM_BUILD_ROOT}/%{_prefix}/ install \
-	DESTDIR=${RPM_BUILD_ROOT}
+%{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 #-----------------------------------------------------------FC9
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/wine
@@ -501,6 +542,13 @@ fi
 
 #--------------------------------------------------------------------
 %changelog
+* Mon Aug 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2-2
+- new upstream release
+- fix %configure (add configu:e and gcc option of x86_64)
+- fix %install (remove wine.desktop and change make install option)
+- add ExclusiveArch: %{ix86} x86_64
+- add BuildRequires for x86_64 (compat32 packages)
+
 * Sat Jun 12 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2-1.rc2
 - update to 1.2-rc2
 - fix spec file