From d7683b92df6752f25a03156896cc3cd6096b646f Mon Sep 17 00:00:00 2001
From: Chaoting Liu <rainman59118@gmail.com>
Date: Sat, 14 Mar 2015 13:50:40 +0000
Subject: [PATCH] wine: fix *.install typo

---
 wine/PKGBUILD     |  2 +-
 wine/wine.install | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/wine/PKGBUILD b/wine/PKGBUILD
index 2bc37d6..a4245c8 100644
--- a/wine/PKGBUILD
+++ b/wine/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=wine
 pkgver=1.7.38
-pkgrel=1
+pkgrel=2
 _pkgbasever=${pkgver/rc/-rc}
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
         30-win32-aliases.conf
diff --git a/wine/wine.install b/wine/wine.install
index 5af7dbc..0e27e13 100644
--- a/wine/wine.install
+++ b/wine/wine.install
@@ -1,13 +1,4 @@
-<<<<<<< HEAD
 post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-=======
-post_upgrade() {
 	update-desktop-database -q
 	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
 	echo "If you are on x86_64, the default WINEARCH will be win64."
@@ -17,15 +8,8 @@ post_upgrade() {
 	echo ""
 }
 
-post_install() {
-	update-desktop-database -q
-	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	echo "If you are on x86_64, the default WINEARCH will be win64."
-	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	echo "See the Arch wiki on wine for more information."
-	echo ""
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
+post_upgrade() {
+	post_install
 }
 
 post_remove() {