python,python3,thunderbird,wine: new upstream release

mesa: create compat32-mesa-dri-drivers subpackage
others: create compat32 subpackage

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

e/elfutils/elfutils-vl.spec

@@ -1,5 +1,7 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define eu_version 0.161
-%define eu_release 1
+%define eu_release 2
 
 %global nocheck true
 
@@ -162,6 +164,20 @@ The elfutils-libelf-static package contains the static archive
 for libelf.
 
 
+# compat32
+%package -n compat32-%{name}-libelf
+Summary: Library to read and write ELF files
+Summary(ja): ELF ファイルを読み書きするためのライブラリ
+License: GPLv2+ or LGPLv3+
+Group: System Environment/Libraries
+Provides: compat32-libelf = %{version}-%{release}
+
+%description -n compat32-%{name}-libelf
+The elfutils-libelf package provides a DSO which allows reading and
+writing ELF files on a high level.  Third party programs depend on
+this package to read internals of ELF files.  The programs of the
+elfutils package use it also to generate new ELF files.
+
 %prep
 %setup -q
 #patch1 -p1 -b .robustify
@@ -218,6 +234,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %postun libelf -p /sbin/ldconfig
 
+%post -n compat32-%{name}-libelf -p /sbin/ldconfig
+
+%postun -n compat32-%{name}-libelf -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -290,8 +310,18 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_libdir}/libelf.a
 
+%if %{build_compat32}
+%files -n compat32-%{name}-libelf
+%defattr(-,root,root)
+%{_libdir}/libelf-%{version}.so
+%{_libdir}/libelf.so.*
+%endif
+
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.161-2
+- create compat32-elfutils-libelf subpackage
+
 * Fri Feb 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.161-1
 - update to 0.161
 - added Japanese summary

j/json-glib/json-glib-vl.spec

@@ -1,8 +1,10 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define glib_ver 2.44.0
 
 Name:		json-glib
 Version:	1.0.4
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	Library for JavaScript Object Notation format
 
 Group:		System Environment/Libraries
@@ -24,7 +26,7 @@ Packager: Takemikaduchi
 for the JavaScript Object Notation (JSON) format.
 
 
-%package devel
+%package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
@@ -37,6 +39,15 @@ Requires:	pkgconfig
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+# compat32
+%package -n compat32-%{name}
+Summary:	Library for JavaScript Object Notation format
+Group:		System Environment/Libraries
+
+%description -n compat32-%{name}
+%{name} is a library providing serialization and deserialization support
+for the JavaScript Object Notation (JSON) format.
+
 
 %prep
 %setup -q
@@ -69,9 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files -f %{name}-1.0.lang
 %defattr(-,root,root,-)
@@ -89,8 +102,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}/
 %{_datadir}/gir-1.0/Json-1.0.gir
 
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/lib%{name}*.so.*
+%endif
+
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.4-2
+- create compat32-json-glib subpackage
+
 * Sat Mar 28 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.4-1
 - new upstream release
 

lib/libs/libsoup/libsoup-vl.spec

@@ -1,8 +1,10 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Summary: Soup, an HTTP library implementation
 Summary(ja): Soup - HTTP ライブラリ実装
 Name: libsoup
 Version: 2.52.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.52/%{name}-%{version}.tar.xz
@@ -37,6 +39,7 @@ on the network in a completely asynchronous fashion, very similar to
 the Gtk+ programming model (a synchronous operation mode is also
 supported for those who want it).
 
+
 %package devel
 Summary: Header files for the Soup library
 Summary(ja): Soup ライブラリのヘッダファイル
@@ -49,6 +52,7 @@ Requires: gnutls-devel, libxml2-devel, libgpg-error-devel
 Libsoup is an HTTP library implementation in C. This package allows 
 you to develop applications that use the libsoup library.
 
+
 %package vala
 Summary: Vala bindings for %{name}
 Summary(ja): %{name} の Vala バインディング
@@ -60,6 +64,24 @@ Requires: vala
 Vala bindings for %{name}.
 
 
+# compat32
+%package -n compat32-%{name}
+Summary: Soup, an HTTP library implementation
+Summary(ja): Soup - HTTP ライブラリ実装
+Group: System Environment/Libraries
+
+%description -n compat32-%{name}
+Libsoup is an HTTP library implementation in C. It was originally part
+of a SOAP (Simple Object Access Protocol) implementation called Soup, but
+the SOAP and non-SOAP parts have now been split into separate packages.
+ 
+libsoup uses the Glib main loop and is designed to work well with GTK
+applications. This enables GNOME applications to access HTTP servers
+on the network in a completely asynchronous fashion, very similar to
+the Gtk+ programming model (a synchronous operation mode is also
+supported for those who want it).
+
+
 %prep
 %setup -q
 
@@ -81,6 +103,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %postun -p /sbin/ldconfig
 
+%post -n compat32-%{name} -p /sbin/ldconfig 
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -102,9 +128,19 @@ rm -rf $RPM_BUILD_ROOT
 %files vala
 %defattr(-, root, root)
 %{_datadir}/vala/vapi/libsoup-2.4.vapi
+%{_datadir}/vala/vapi/libsoup-2.4.deps
+
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-, root, root)
+%{_libdir}/lib*.so.*
+%endif
 
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.52.2-2
+- create compat32-libsoup subpackage
+
 * Fri Nov 13 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.52.2-1
 - new upstream release
 

m/mesa/mesa-vl.spec

@@ -19,7 +19,7 @@ Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
 Version: 11.0.9
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -359,6 +359,17 @@ Requires: %{name}-libglapi
 Mesa shared glapi
 
 
+%package -n compat32-%{name}-dri-drivers
+Summary: Mesa-based DRI drivers
+Summary(ja): Mesa ベースの DRI ドライバ
+Group: User Interface/X Hardware Support
+Obsoletes: mesa-libGL < 8.0.4
+
+%description -n compat32-%{name}-dri-drivers
+Mesa-based DRI drivers.
+
+
+
 %prep
 %setup -q
 
@@ -521,12 +532,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/dri.pc
 
 %files dri-drivers
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/drirc
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
-#%{_libdir}/libdricore*.so*
-#%dir %{_libdir}/gallium-pipe
-#%{_libdir}/gallium-pipe/*.so
 
 %files vdpau-drivers
 %defattr(-,root,root,-)
@@ -692,9 +701,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgbm.so.1
 %{_libdir}/libgbm.so.1.*
 
+%files -n compat32-%{name}-dri-drivers
+%defattr(-,root,root,-)
+%dir %{_libdir}/dri
+%{_libdir}/dri/*_dri.so
+
 %endif
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 11.0.9-2
+- create compat32-mesa-dri-drivers subpackage
+
 * Sun Jan 24 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 11.0.9-1
 - update to 11.0.9
 

p/python/python-vl.spec

@@ -11,7 +11,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
-Version: %{pybasever}.10
+Version: %{pybasever}.11
 Release: 1%{?_dist_release}
 License: PSF
 Group: Development/Languages
@@ -466,6 +466,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.7.11-1
+- new upstream release
+
 * Sat Oct 10 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.7.10-1
 - new upstream release
 

p/python3/python3-vl.spec

@@ -7,14 +7,16 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
-Version: 3.4.3
+Version: 3.4.4
 Release: 1%{?_dist_release}
 License: PSF
 Group: Development/Languages
 URL: http://www.python.org/download/releases/%{version}
 Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-Source1: http://docs.python.org/py3k/archives/python-%{version}-docs-html.tar.bz2
+Source1: https://docs.python.org/3.4/archives/python-%{version}-docs-html.tar.bz2
 Patch1: python-3.4.2-lib64.patch
+Patch2: python3-3.4.4-revert-makefile.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: expat-devel
 BuildRequires: libdb-devel
@@ -113,6 +115,7 @@ for the Python language.
 %if %{_lib} == lib64
 %patch1 -p1 -b .lib64
 %endif
+%patch2 -p1 -b .libpl
 
 
 %build
@@ -272,6 +275,10 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.4-1
+- new upstream release
+- add Patch2 (python3-3.4.4-revert-makefile.patch)
+
 * Sun Apr 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.3-1
 - new upstream release
 

r/rest/rest-vl.spec

@@ -1,5 +1,7 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define         package_version 0.7.93
-%define         package_release 1%{?_dist_release}
+%define         package_release 2%{?_dist_release}
 
 Name:           rest
 Version:        %{package_version}
@@ -60,6 +62,19 @@ BuildArch:      noarch
 This package contains documentation for rest.
 
 
+# compat32
+%package -n compat32-%{name}
+Summary:        RESTful web api query library
+Group:          System Environment/Libraries
+
+%description -n compat32-%{name}
+This library has been designed to make it easier to access web services that
+claim to be "RESTful". A reasonable definition of what this means can be found
+on Wikipedia [1]. However a reasonable description is that a RESTful service
+should have urls that represent remote objects which methods can then be
+called on.
+
+
 %prep
 %setup -q
 
@@ -85,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%post -n compat32-%{name} -p /sbin/ldconfig
+
+%postun -n compat32-%{name} -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog AUTHORS COPYING NEWS README
@@ -102,8 +121,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/%{name}-0.7
 
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+%endif
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.93-2
+- create compat32-rest subpakcage
+
 * Sat Mar 28 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.93-1
 - new upstream release
 

t/thunderbird/thunderbird-vl.spec

@@ -1,5 +1,5 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 38.5.1
+%define tbmajor 38.6.0
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
@@ -372,6 +372,9 @@ fi
 #===============================================================================
 
 %changelog
+* Sat Feb 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 38.6.0-1
+- new upstream release
+
 * Sat Jan 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 38.5.1-1
 - new upstream release
 

w/wine/wine-vl.spec

@@ -1,12 +1,12 @@
-%define pkg_major_version 1.8
+%define pkg_major_version 1.8.1
 %define pkg_name wine
 %define pkg_release 1%{?_dist_release}
 
 # NEW Release: numbering rule. -- Release: 1%{?_dist_release} 
 # spec file for package wine.. # base (SUSE10 and fedora core 9)
 
-Summary:	Allows running Windows 16/32/64 bit programs on Unix.
+Summary:	Allows running Windows 16/32 bit programs on Unix.
-Summary(ja):    Unix で 16/32/64ビットWindoowsプログラムを実行させます
+Summary(ja):    Unix で 16/32ビットWindoowsプログラムを実行させます
 Name:		%{pkg_name}
 Version:	%{pkg_major_version}
 Release:	%{pkg_release}
@@ -21,6 +21,7 @@ Source0: http://prdownloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
 Source1:	wine.init
 Source3:	wine-README-Fedora
 Source4:	wine-32.conf
+Source5:	wine-64.conf
 # desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
@@ -41,6 +42,7 @@ Source300:      wine-mime-msi.desktop
 Patch0:         wine-prefixfonts.patch
 Patch1:         wine-1.1.28-rpath.patch
 Patch2:         wine-1.7.40-x86_64_gstreamer.patch
+Patch3:			wine-cjk.patch
 
 # ADD ja
 Source801: wine_README.ja
@@ -150,6 +152,7 @@ BuildRequires: compat32-openldap-devel
 
 Requires:	compat32-freetype2
 Requires:	compat32-ncurses
+Requires:	compat32-eudev-libudev
 %endif
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service
@@ -184,12 +187,29 @@ Windows 3.x/9x/NT バイナリを x86 や x86_64 のUnix システムで動作
 Windows システムの .dll ファイルが存在するのならば、それを使用する
 事もできます
 
+#--------------------------------------------------------------------
+%package 64bit
+Summary: Allows running Windows 64 bit programs on Unix.
+Summary(ja): Unix で 64ビットWindoowsプログラムを実行させます
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description 64bit
+(WINE Is Not an Emulator)
+ While Wine is usually thought of as a Windows(TM) emulator,
+the Wine developers would prefer that users thought of 
+Wine as a Windows compatibility layer for UNIX.
+ This package includes a program loader, which allows
+unmodified Windows 64bit binaries to run on x86_64 Unixes.
+Wine does not require MS Windows, but it can use native 
+system .dll files if they are available.
+
 #--------------------------------------------------------------------
 %package devel
 Summary: Wine development environment
 Summary(ja):    WINE の開発ファイルです
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This RPM contains the header files and development tools 
@@ -205,7 +225,7 @@ WINEの開発用ライブラリやヘッダーファイル、そして開発用
 Summary: WINE binfmt_misc kernel function used for init file.
 Summary(ja): WINE で binfmt_misc機能 を使うための起動ファイルです
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description init
 WINE binfmt_misc kernel function used for init file.
@@ -237,7 +257,11 @@ Of course, please be mindful of security.
 %setup -q -n %{name}-%{version}
 %ifarch x86_64
 %patch2 -p1
+rm -rf ../64bit
+mkdir ../64bit
+cp -r * ../64bit/
 %endif
+%patch3 -p1 -b .cjk
 
 # fix typo
 sed -i "s|Thamoa|Tahoma|" po/ja.po
@@ -248,14 +272,27 @@ autoreconf -if
 export CFLAGS="-O2 -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables -fno-strict-aliasing -fno-schedule-insns2"
 ./configure \
 	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
+	--libdir=%{_prefix}/lib \
 	--with-x \
-	--without-jack \
 	--without-capi \
 	--without-gphoto \
 	--without-hal \
 	--without-mpg123 \
-	--without-sane
+	--without-sane 
+
+pushd ../64bit
+autoreconf -if
+export CFLAGS="$RPM_OPT_FLAGS"
+%{configure} \
+	--prefix=%{_prefix} \
+	--with-x \
+	--without-capi \
+	--without-gphoto \
+	--without-hal \
+	--without-mpg123 \
+	--without-sane \
+    --enable-win64
+popd
 %else
 export CFLAGS="$RPM_OPT_FLAGS"
 %{configure} \
@@ -271,12 +308,28 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 grep "have_x=yes" config.log || exit 1
 
+%ifarch x86_64
+export CFLAGS="-O2 -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables -fno-strict-aliasing -fno-schedule-insns2"
+%{__make} depend
+%{__make} %{?_smp_mflags}
+export CFLAGS="$RPM_OPT_FLAGS"
+pushd ../64bit
+%{__make} depend
+%{__make} %{?_smp_mflags}
+popd
+%else
 %{__make} depend
-
 %{__make} %{?_smp_mflags}
+%endif
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
+%ifarch x86_64
+pushd ../64bit
+%{__make} install DESTDIR=${RPM_BUILD_ROOT}
+mv ${RPM_BUILD_ROOT}%{_bindir}/wineserver ${RPM_BUILD_ROOT}%{_bindir}/wineserver64
+popd
+%endif
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 #-----------------------------------------------------------FC9
@@ -359,8 +412,11 @@ cp %{SOURCE801} documentation/README.ja
 cp %{SOURCE804} documentation/README_add.ja
 cp %{SOURCE805} %{SOURCE806} %{SOURCE807} %{SOURCE808} %{SOURCE809} documentation/
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
 install -p -m644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
+%ifarch x86_64
+install -p -m644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d/
+%endif
 
 # check desktop files
 %check
@@ -403,6 +459,10 @@ fi
 /sbin/ldconfig
 update-desktop-database &>/dev/null || :
 
+%post 64bit -p /sbin/ldconfig
+
+%postun 64bit -p /sbin/ldconfig
+
 %post init
 if [ $1 = 1 ]; then
 /sbin/chkconfig --add wine
@@ -448,20 +508,19 @@ fi
 %doc README VERSION
 %doc README-Fedora
 %doc README-Fedora.ja 
-%doc documentation/README* documentation/ChangeLog*
+%doc documentation/README*
 %doc documentation/ja_fonts_replace* 
 %doc documentation/fonts-replace-list.txt
-### %{_bindir}/*
+%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
 %{_bindir}/msiexec
 %{_bindir}/regedit
 %{_bindir}/regsvr32
 %{_bindir}/wine
 %{_bindir}/wineboot
 %{_bindir}/wineconsole
-## %{_bindir}/wineprefixcreate
 %{_bindir}/winecfg
 %{_bindir}/wine-preloader
-# winelauncher --> Remove
 %{_bindir}/wineserver
 %{_bindir}/notepad
 %{_bindir}/winedbg
@@ -470,28 +529,45 @@ fi
 %{_bindir}/winemaker
 %{_bindir}/winemine
 %{_bindir}/winepath
-## winhelp -> renamed winhlp32.exe
+%ifarch x86_64
-%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
+%{_prefix}/lib/libwine.so.1*
-%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+%dir %{_prefix}/lib/wine
+%{_prefix}/lib/wine/*.cpl.so
+%{_prefix}/lib/wine/*.exe.so
+%{_prefix}/lib/wine/*.exe16.so
+%{_prefix}/lib/wine/*.dll.so
+%{_prefix}/lib/wine/*.dll16.so
+%{_prefix}/lib/wine/*.drv.so
+%{_prefix}/lib/wine/*.drv16.so
+%{_prefix}/lib/wine/*.mod16.so
+%{_prefix}/lib/wine/*.ds.so
+%{_prefix}/lib/wine/*.ocx.so
+%{_prefix}/lib/wine/*.vxd.so
+%{_prefix}/lib/wine/*.acm.so
+%{_prefix}/lib/wine/*.sys.so
+%{_prefix}/lib/wine/*.tlb.so
+%dir %{_prefix}/lib/wine/fakedlls
+%{_prefix}/lib/wine/fakedlls/*
+%else
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
 %{_libdir}/wine/*.cpl.so
 %{_libdir}/wine/*.exe.so
-%{_libdir}/wine/*.exe16.so
 %{_libdir}/wine/*.dll.so
-%{_libdir}/wine/*.dll16.so
 %{_libdir}/wine/*.drv.so
-%{_libdir}/wine/*.drv16.so
-%{_libdir}/wine/*.mod16.so
-## %{_libdir}/wine/*.*16
 %{_libdir}/wine/*.ds.so
 %{_libdir}/wine/*.ocx.so
-%{_libdir}/wine/*.vxd.so
 %{_libdir}/wine/*.acm.so
 %{_libdir}/wine/*.sys.so
 %{_libdir}/wine/*.tlb.so
+%{_libdir}/wine/*.exe16.so
+%{_libdir}/wine/*.dll16.so
+%{_libdir}/wine/*.drv16.so
+%{_libdir}/wine/*.mod16.so
+%{_libdir}/wine/*.vxd.so
 %dir %{_libdir}/wine/fakedlls
 %{_libdir}/wine/fakedlls/*
+%endif
 %dir %{_datadir}/wine
 %{_datadir}/wine/*
 %{_datadir}/applications/vine-wine-mime-msi.desktop
@@ -517,11 +593,32 @@ fi
 %{_mandir}/man1/winefile.1*
 %{_mandir}/man1/winemine.1*
 %{_mandir}/man1/winepath.1*
-## %{_mandir}/man1/wineprefixcreate.1*
 %lang(de) %{_mandir}/de.UTF-8/man1/*.1*
 %lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %lang(pl) %{_mandir}/pl.UTF-8/man1/wine.1*
 
+#--------------------------------------------------------------------
+%ifarch x86_64
+%files 64bit
+%defattr(-,root,root,-)
+%{_sysconfdir}/ld.so.conf.d/wine-64.conf
+%{_bindir}/wine64
+%{_bindir}/wine64-preloader
+%{_bindir}/wineserver64
+%{_libdir}/libwine.so.1*
+%dir %{_libdir}/wine
+%{_libdir}/wine/*.cpl.so
+%{_libdir}/wine/*.exe.so
+%{_libdir}/wine/*.dll.so
+%{_libdir}/wine/*.drv.so
+%{_libdir}/wine/*.ds.so
+%{_libdir}/wine/*.ocx.so
+%{_libdir}/wine/*.acm.so
+%{_libdir}/wine/*.sys.so
+%{_libdir}/wine/*.tlb.so
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*
+%endif
 #--------------------------------------------------------------------
 %files devel
 %defattr(-,root,root,-)
@@ -541,6 +638,12 @@ fi
 %{_libdir}/wine/*.a
 %{_libdir}/wine/*.def
 
+%ifarch x86_64
+%{_prefix}/lib/*.so
+%{_prefix}/lib/wine/*.a
+%{_prefix}/lib/wine/*.def
+%endif
+
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*
 %{_mandir}/man1/winecpp.1*
@@ -552,7 +655,6 @@ fi
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
 
-
 #--------------------------------------------------------------------
 %files init
 %defattr(-,root,root,-)
@@ -561,6 +663,14 @@ fi
 
 #--------------------------------------------------------------------
 %changelog
+* Thu Feb 11 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.1-1
+- new upstream release
+- add Source5 (wine-64.conf)
+- add Patch3 (wine-cjk.patch) based on fedora
+- add Requires: compat32-eudev-libudev
+- add configure option (--enable-win64)
+- create wine-64bit subpackage
+
 * Sun Dec 20 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8-1
 - new upstream release
 - remove Patch400,401,402