rpms/wine/devel .cvsignore, 1.87, 1.88 sources, 1.88, 1.89 wine-uninstaller.desktop, 1.5, 1.6 wine.spec, 1.125, 1.126

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7748/devel

Modified Files:
	.cvsignore sources wine-uninstaller.desktop wine.spec 
Log Message:
- 1.2 rc4
- fix requires for -common



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	14 Jun 2010 04:53:57 -0000	1.87
+++ .cvsignore	19 Jun 2010 08:23:30 -0000	1.88
@@ -1 +1 @@
-wine-1.2-rc3.tar.bz2
+wine-1.2-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	14 Jun 2010 04:53:58 -0000	1.88
+++ sources	19 Jun 2010 08:23:30 -0000	1.89
@@ -1 +1 @@
-d70dd15b72809d69330a9ede3ac02e4b  wine-1.2-rc3.tar.bz2
+761eaf2174aa1fff0b75059abf482e2f  wine-1.2-rc4.tar.bz2


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine-uninstaller.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- wine-uninstaller.desktop	31 May 2010 13:17:19 -0000	1.5
+++ wine-uninstaller.desktop	19 Jun 2010 08:23:30 -0000	1.6
@@ -2,7 +2,7 @@
 Name=Wine Software Uninstaller
 Comment=Interface to uninstall software
 Exec=wine uninstaller
-Icon=wine
+Icon=msiexec
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- wine.spec	14 Jun 2010 04:53:58 -0000	1.125
+++ wine.spec	19 Jun 2010 08:23:30 -0000	1.126
@@ -1,13 +1,13 @@
 %define no64bit 0
 Name:		wine
 Version:	1.2.0
-Release:	0.3.rc3%{?dist}
+Release:	0.4.rc4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPLv2+
 URL:		http://www.winehq.org/
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc3.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc4.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -114,7 +114,6 @@ BuildRequires:  libv4l-devel
 BuildRequires:  fontpackages-devel
 BuildRequires:  icoutils
 BuildRequires:  ImageMagick-devel
-Requires:       wine-common = %{version}-%{release}
 Requires:       wine-desktop = %{version}-%{release}
 Requires:       wine-fonts = %{version}-%{release}
 
@@ -163,6 +162,8 @@ Obsoletes:      wine <= 0.9.15-1%{?dist}
 Obsoletes:      wine-arts < 0.9.34
 Obsoletes:      wine-tools <= 1.1.27
 Provides:       wine-tools = %{version}-%{release}
+# require -common so we get wine.inf (#528335)
+Requires:       wine-common = %{version}-%{release}
 # fix dns resolution (#492700)
 # require both to be sure 64bit is present as well...
 %ifarch %{ix86}
@@ -409,7 +410,7 @@ This package adds an openal driver for w
 
 
 %prep
-%setup -q -n %{name}-1.2-rc3
+%setup -q -n %{name}-1.2-rc4
 
 %patch1
 %patch100
@@ -1253,8 +1254,15 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Fri Jun 18 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.4.rc4
+- version upgrade
+- fixes winecfg on 64bit (#541986)
+- require wine-common from -core to ensure man pages and wine.inf are present
+  (#528335)
+
 * Sun Jun 13 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 1.2-0.2.rc3
+- 1.2-0.3.rc3
 - version upgrade
 
 * Mon May 31 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>