[wine/el6: 114/114] Merge branch 'f15' into el6

[Andreas Bierfert]

commit 8eb1d3decc7cc37098fbbfe9a06f117eed963356
Merge: 49d9c01 e613af0
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Mar 7 21:43:22 2012 +0100

    Merge branch 'f15' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	wine-rpath.patch
    	wine.spec
    	winepulse-0.38-winecfg.patch
    	winepulse-0.38.patch

 .gitignore                        |    5 +-
 README-FEDORA-PULSEAUDIO          |   61 -
 sources                           |    3 +-
 wine-README-tahoma                |   19 +
 wine-chooser.sh                   |   39 -
 wine-gecko.patch                  |  127 --
 wine-mime-msi.desktop             |    3 +-
 wine-notepad.desktop              |    1 -
 wine-oleview.desktop              |    1 -
 wine-regedit.desktop              |    1 -
 wine-rpath.patch                  |   14 +-
 wine-tahoma.conf                  |   11 +
 wine-uninstaller.desktop          |    1 -
 wine-wineboot.desktop             |    1 -
 wine-winecfg.desktop              |    1 -
 wine-winefile.desktop             |    1 -
 wine-winemine.desktop             |    3 +-
 wine-winhelp.desktop              |    1 -
 wine-wordpad.desktop              |    1 -
 wine.init                         |   11 +-
 wine.spec                         |  940 +++++++++----
 wine.systemd                      |    5 +
 winepulse-0.38-configure.ac.patch |   61 -
 winepulse-0.38-winecfg.patch      |  313 -----
 winepulse-0.38.patch              | 2673 -------------------------------------
 25 files changed, 721 insertions(+), 3576 deletions(-)
---
diff --cc .gitignore
index 0622dd2,5bcb878..68fd31c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,32 +1,2 @@@
- /wine-1.2.1.tar.bz2
- /wine-1.2.2.tar.bz2
- /wine-1.2.3.tar.bz2
 -/wine-1.3.29.tar.bz2
 -/wine-1.3.29.tar.bz2.sign
 -/wine-1.3.30.tar.bz2
 -/wine-1.3.30.tar.bz2.sign
 -/wine-1.3.31.tar.bz2
 -/wine-1.3.31.tar.bz2.sign
 -/wine-1.3.32.tar.bz2
 -/wine-1.3.32.tar.bz2.sign
 -/wine-1.3.33.tar.bz2
 -/wine-1.3.33.tar.bz2.sign
 -/wine-1.3.34.tar.bz2
 -/wine-1.3.34.tar.bz2.sign
 -/wine-1.3.35.tar.bz2
 -/wine-1.3.35.tar.bz2.sign
 -/wine-1.3.36.tar.bz2
 -/wine-1.3.36.tar.bz2.sign
 -/wine-1.3.37.tar.bz2
 -/wine-1.3.37.tar.bz2.sign
 -/wine-1.4-rc1.tar.bz2.sign
 -/wine-1.4-rc1.tar.bz2
 -/wine-1.4-rc2.tar.bz2.sign
 -/wine-1.4-rc2.tar.bz2
 -/wine-1.4-rc3.tar.bz2
 -/wine-1.4-rc3.tar.bz2.sign
 -/wine-1.4-rc4.tar.bz2
 -/wine-1.4-rc4.tar.bz2.sign
 -/wine-1.4-rc5.tar.bz2
 -/wine-1.4-rc5.tar.bz2.sign
 -/wine-1.4-rc6.tar.bz2
 -/wine-1.4-rc6.tar.bz2.sign
+ /wine-1.4.tar.bz2
+ /wine-1.4.tar.bz2.sign