packages: wine/wine-ca_certificates.patch, wine/wine-manpaths.patch, wine/w...

mmazur mmazur at pld-linux.org
Tue Apr 10 17:06:35 CEST 2012


Author: mmazur                       Date: Tue Apr 10 15:06:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to the currently stable 1.4 (taken from DEVEL)
- works for me, so rel1 and stbr I guess

---- Files affected:
packages/wine:
   wine-ca_certificates.patch (1.1 -> 1.2) , wine-manpaths.patch (1.7 -> 1.8) , wine-ncurses.patch (1.10 -> 1.11) , wine-uninstaller.desktop (1.3 -> 1.4) , wine.spec (1.403 -> 1.404) , wine-secur32.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/wine/wine-ca_certificates.patch
diff -u packages/wine/wine-ca_certificates.patch:1.1 packages/wine/wine-ca_certificates.patch:1.2
--- packages/wine/wine-ca_certificates.patch:1.1	Mon Nov 17 11:49:55 2008
+++ packages/wine/wine-ca_certificates.patch	Tue Apr 10 17:06:29 2012
@@ -1,9 +1,9 @@
---- wine-1.1.8/dlls/crypt32/rootstore.c.org	2008-11-17 10:26:55.794870595 +0000
-+++ wine-1.1.8/dlls/crypt32/rootstore.c	2008-11-17 10:30:18.050258256 +0000
-@@ -439,6 +439,7 @@
-  "/etc/ssl/certs",
+--- wine-1.3.25/dlls/crypt32/rootstore.c~	2011-07-22 19:32:43.000000000 +0200
++++ wine-1.3.25/dlls/crypt32/rootstore.c	2011-07-29 14:50:36.459205636 +0200
+@@ -487,6 +487,7 @@
   "/etc/pki/tls/certs/ca-bundle.crt",
   "/usr/local/share/certs/",
+  "/etc/sfw/openssl/certs",
 + "/etc/certs/ca-certificates.crt",
  };
  

================================================================
Index: packages/wine/wine-manpaths.patch
diff -u packages/wine/wine-manpaths.patch:1.7 packages/wine/wine-manpaths.patch:1.8
--- packages/wine/wine-manpaths.patch:1.7	Fri Jun 11 19:51:38 2010
+++ packages/wine/wine-manpaths.patch	Tue Apr 10 17:06:29 2012
@@ -1,6 +1,6 @@
---- wine-1.1.41/loader/Makefile.in.orig	2010-03-19 20:02:16.000000000 +0100
-+++ wine-1.1.41/loader/Makefile.in	2010-03-20 15:17:34.000000000 +0100
-@@ -24,8 +24,8 @@
+--- wine-1.3.9/server/Makefile.in~	2010-12-10 20:33:07.000000000 +0100
++++ wine-1.3.9/server/Makefile.in	2010-12-10 23:38:49.953335249 +0100
+@@ -54,8 +54,8 @@
  INSTALLDIRS = \
  	$(DESTDIR)$(bindir) \
  	$(DESTDIR)$(mandir)/man$(prog_manext) \
@@ -8,56 +8,23 @@
 -	$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
 +	$(DESTDIR)$(mandir)/de/man$(prog_manext) \
 +	$(DESTDIR)$(mandir)/fr/man$(prog_manext)
-
- all: wine wine-installed $(EXTRA_BINARIES) $(MANPAGES)
-
-@@ -55,11 +55,11 @@
-
- install-man-pages: $(MANPAGES) $(INSTALLDIRS) dummy
- 	$(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
--	$(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
--	$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
-+	$(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext)
-+	$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext)
-
- uninstall::
- 	-cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES)
- 	$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
--	$(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
--	$(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
-+	$(RM) $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext)
-+	$(RM) $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext)
---- wine-1.1.43/server/Makefile.in.orig	2010-04-16 19:53:23.000000000 +0200
-+++ wine-1.1.43/server/Makefile.in	2010-04-20 20:50:09.000000000 +0200
-@@ -57,8 +57,8 @@
- INSTALLDIRS = \
- 	$(DESTDIR)$(bindir) \
- 	$(DESTDIR)$(mandir)/man$(prog_manext) \
--	$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
--	$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
-+	$(DESTDIR)$(mandir)/de/man$(prog_manext) \
-+	$(DESTDIR)$(mandir)/fr/man$(prog_manext)
-
- all: $(PROGRAMS) $(MANPAGES)
-
-@@ -73,10 +73,10 @@
- install install-lib:: wineserver-installed $(MANPAGES) $(INSTALLDIRS)
+ 
+ all: $(PROGRAMS)
+ 
+@@ -71,8 +71,8 @@
  	$(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver
- 	$(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
+ 
+ install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS)
 -	$(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
 -	$(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
 +	$(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wineserver.$(prog_manext)
 +	$(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext)
-
+ 
  uninstall::
- 	$(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
--	$(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
--	$(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
-+	$(RM) $(DESTDIR)$(mandir)/de/man$(prog_manext)/wineserver.$(prog_manext)
-+	$(RM) $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext)
---- wine-1.2-rc2/tools/Makefile.in.orig	2010-05-28 19:39:36.000000000 +0200
-+++ wine-1.2-rc2/tools/Makefile.in	2010-06-11 19:29:20.000000000 +0200
-@@ -37,8 +37,8 @@
+ 	$(RM) $(DESTDIR)$(bindir)/wineserver
+--- wine-1.3.9/tools/Makefile.in~	2010-12-10 20:33:07.000000000 +0100
++++ wine-1.3.9/tools/Makefile.in	2010-12-10 23:39:44.986668581 +0100
+@@ -32,8 +32,8 @@
  	$(DESTDIR)$(datadir)/applications \
  	$(DESTDIR)$(datadir)/wine \
  	$(DESTDIR)$(mandir)/man$(prog_manext) \
@@ -65,28 +32,45 @@
 -	$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
 +	$(DESTDIR)$(mandir)/de/man$(prog_manext) \
 +	$(DESTDIR)$(mandir)/fr/man$(prog_manext)
-
+ 
  UPDATE_DESKTOP_DATABASE = update-desktop-database
-
-@@ -79,8 +79,8 @@
- install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
- 	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
- 	$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
+ 
+@@ -75,8 +75,8 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
+ 
+ install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS)
 -	$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
 -	$(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
 +	$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext)
 +	$(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/winemaker.$(prog_manext)
-
+ 
  uninstall::
  	$(RM) $(DESTDIR)$(datadir)/wine/wine.inf \
-@@ -88,8 +88,8 @@
- 		$(DESTDIR)$(datadir)/applications/wine.desktop \
- 		$(DESTDIR)$(bindir)/winemaker \
- 		$(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
--		$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \
--		$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
-+		$(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext) \
-+		$(DESTDIR)$(mandir)/fr/man$(prog_manext)/winemaker.$(prog_manext)
- 	-$(UPDATE_DESKTOP_DATABASE)
-
- depend: makedep$(EXEEXT)
+--- wine-1.3.22/loader/Makefile.in.orig	2011-06-10 20:08:11.000000000 +0200
++++ wine-1.3.22/loader/Makefile.in	2011-06-12 17:41:34.984957008 +0200
+@@ -24,9 +24,9 @@
+ INSTALLDIRS = \
+ 	$(DESTDIR)$(bindir) \
+ 	$(DESTDIR)$(mandir)/man$(prog_manext) \
+-	$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
+-	$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \
+-	$(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)
++	$(DESTDIR)$(mandir)/de/man$(prog_manext) \
++	$(DESTDIR)$(mandir)/fr/man$(prog_manext) \
++	$(DESTDIR)$(mandir)/pl/man$(prog_manext)
+ 
+ all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES)
+ 
+@@ -53,9 +53,9 @@
+ 	$(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY)
+ 
+ install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy
+-	$(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
+-	$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
+-	$(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext)
++	$(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext)
++	$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext)
++	$(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl/man$(prog_manext)/wine.$(prog_manext)
+ 
+ uninstall::
+ 	-cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES)

================================================================
Index: packages/wine/wine-ncurses.patch
diff -u packages/wine/wine-ncurses.patch:1.10 packages/wine/wine-ncurses.patch:1.11
--- packages/wine/wine-ncurses.patch:1.10	Sat Jul 14 22:58:42 2007
+++ packages/wine/wine-ncurses.patch	Tue Apr 10 17:06:29 2012
@@ -37,3 +37,32 @@
  # define CURSES_NAME "ncurses"
  #else
  # define CURSES_NAME "curses"
+--- wine-1.3.13/dlls/kernel32/term.c~	2011-02-04 20:06:51.000000000 +0100
++++ wine-1.3.13/dlls/kernel32/term.c	2011-02-05 16:25:43.627060372 +0100
+@@ -27,6 +27,8 @@
+ # include <ncurses.h>
+ #elif defined(HAVE_CURSES_H)
+ # include <curses.h>
++#elif defined(HAVE_NCURSES_NCURSES_H)
++# include <ncurses/ncurses.h>
+ #endif
+ /* avoid redefinition warnings */
+ #undef KEY_EVENT
+@@ -34,6 +36,8 @@
+ 
+ #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
+ #include <term.h>
++#elif defined(HAVE_NCURSES_NCURSES_H)
++#include <ncurses/term.h>
+ #endif
+ 
+ #include <windef.h>
+@@ -148,7 +152,7 @@
+ 
+ #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
+ 
+-#ifdef HAVE_NCURSES_H
++#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H)
+ # define CURSES_NAME "ncurses"
+ #else
+ # define CURSES_NAME "curses"

================================================================
Index: packages/wine/wine-uninstaller.desktop
diff -u packages/wine/wine-uninstaller.desktop:1.3 packages/wine/wine-uninstaller.desktop:1.4
--- packages/wine/wine-uninstaller.desktop:1.3	Fri Dec  3 16:36:58 2010
+++ packages/wine/wine-uninstaller.desktop	Tue Apr 10 17:06:29 2012
@@ -4,6 +4,6 @@
 Name[pl]=Narzędzie usuwania aplikacji Wine
 Comment=Remove installed Wine applications
 Comment[pl]=Usuwanie zainstalowanych aplikacji Wine
-Exec=wine uninstaller %f
+Exec=uninstaller %f
 Icon=wine
 Categories=System;

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.403 packages/wine/wine.spec:1.404
--- packages/wine/wine.spec:1.403	Thu Jan 19 00:36:29 2012
+++ packages/wine/wine.spec	Tue Apr 10 17:06:29 2012
@@ -2,16 +2,12 @@
 #
 # Conditional build:
 %bcond_without	alsa		# don't build ALSA mm driver
-%bcond_with	esd		# build ESD mm driver
-%bcond_without	jack		# don't build JACK mm driver
-%bcond_without	nas		# don't build NAS mm driver
+%bcond_without	capi		# don't build CAPI 2.0 (ISDN) support
+%bcond_without	gstreamer	# don't build GStreamer filters support
 %bcond_without	sane		# don't build TWAIN DLL with scanning support (through SANE)
 %bcond_without	ldap		# don't build LDAP DLL
 %bcond_without	cups		# without CUPS printing support in winspool,wineps DLLs
 #
-# TODO:
-# - support for CAPI (ISDN support; --with-capi)
-#
 # NOTE: wine detects the following SONAMES for dlopen at build time:
 #   libcrypto,libssl (wininet.dll)
 #   libcups (winspool.dll.so,wineps.dll.so)
@@ -19,30 +15,27 @@
 #   libfontconfig (gdi32.dll.so)
 #   libfreetype (wineps.dll.so,gdi32.dll.so)
 #   libGL (x11drv.dll.so,ddraw.dll.so)
-#   libjack (winejack.drv.so - explicit dependency in subpackage)
 #   libX11, libXext, libXi, libXrender (x11drv.dll.so)
 # thus requires rebuild after change of any of the above.
 #
-# JACK requires ALSA
-%if %{without alsa}
-%undefine	with_jack
-%endif
-
+%define		gecko_ver	1.4
 Summary:	Program that lets you launch Win applications
 Summary(es.UTF-8):	Ejecuta programas Windows en Linux
 Summary(pl.UTF-8):	Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):	Executa programas Windows no Linux
 Name:		wine
-Version:	1.2.3
-Release:	3
+Version:	1.4
+Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
-Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	a18ca677d1e01d1596d6692a8f3997e5
-Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.0.0-x86.cab
-# Source1-md5:	9c5c335fc077c0558561afaf25a09e51
-Source2:	%{name}-uninstaller.desktop
+Source0:	http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
+# Source0-md5:	6594ab86a4b1fb2c09dadfb4ea7fc4af
+Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86.msi
+# Source1-md5:	700aaa08724be1992cffed7b87e79a44
+Source2:	http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86_64.msi
+# Source2-md5:	7b4811f667fd01d300fdff68420a9c72
+Source3:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-ncurses.patch
@@ -50,7 +43,6 @@
 Patch5:		%{name}-ca_certificates.patch
 Patch6:		%{name}-manpaths.patch
 Patch7:		desktop.patch
-#PatchX:	%{name}-dga.patch
 URL:		http://www.winehq.org/
 BuildRequires:	OpenAL-devel >= 1.1
 BuildRequires:	OpenGL-GLU-devel
@@ -59,18 +51,19 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
+%{?with_capi:BuildRequires:	capi4k-utils-devel}
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-utils
-%{?with_esd:BuildRequires:	esound-devel}
 BuildRequires:	flex
 BuildRequires:	fontconfig-devel
 BuildRequires:	fontforge
 BuildRequires:	freetype-devel >= 2.0.5
+BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	gnutls-devel
+%{?with_gstreamer:BuildRequires:	gstreamer-plugins-base-devel}
 BuildRequires:	icoutils
-%{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	lcms-devel
 BuildRequires:	libgphoto2-devel
 BuildRequires:	libgsm-devel
@@ -79,7 +72,6 @@
 BuildRequires:	libtool
 BuildRequires:	libv4l-devel
 BuildRequires:	libxslt-devel
-%{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
 # db2* failed previously - probably openjade or opensp bug
 BuildRequires:	openjade >= 1:1.3.3-0.pre1
@@ -87,6 +79,7 @@
 BuildRequires:	opensp >= 1:1.5.1
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
+BuildRequires:	prelink
 %{?with_sane:BuildRequires:	sane-backends-devel}
 BuildRequires:	unixODBC-devel >= 2.2.12-2
 #BuildRequires:	valgrind
@@ -99,14 +92,11 @@
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
-%ifarch %{x8664}
-Requires:	libfreetype.so.6()(64bit)
-%else
 Requires:	libfreetype.so.6
-%endif
 Requires(post):	/sbin/ldconfig
 Suggests:	binfmt-detector
 Suggests:	ca-certificates
+Suggests:	cabextract
 Conflicts:	ca-certificates < 20080809-4
 # for printing needs lpr
 Suggests:	cups-clients
@@ -118,6 +108,8 @@
 Provides:	libntdll.dll.so
 Obsoletes:	wine-doc-pdf
 Obsoletes:	wine-drv-arts
+Obsoletes:	wine-drv-jack
+Obsoletes:	wine-drv-nas
 ExclusiveArch:	%{ix86} %{x8664}
 ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -189,6 +181,19 @@
 %description programs -l pl.UTF-8
 Wine - programy.
 
+%package dll-capi
+Summary:	CAPI 2.0 (ISDN) implementation DLLs for Wine
+Summary(pl.UTF-8):	Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine
+Group:		Applications/Emulators
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dll-capi
+CAPI 2.0 (ISDN) implementation DLLs for Wine (through OpenGL).
+
+%description dll-capi -l pl.UTF-8
+Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine (poprzez
+OpenGL).
+
 %package dll-d3d
 Summary:	Direct3D implementation DLLs for Wine
 Summary(pl.UTF-8):	Biblioteki DLL z implementacją Direct3D dla Wine
@@ -247,40 +252,8 @@
 %description drv-alsa -l pl.UTF-8
 Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
 
-%package drv-jack
-Summary:	JACK driver for WINE mm.dll implementation
-Summary(pl.UTF-8):	Sterownik JACK-a dla implementacji mm.dll w Wine
-Group:		Applications/Emulators
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	jack-audio-connection-kit
-# dlopened by SONAME detected at build time
-%ifarch %{x8664}
-%{?with_jack:Requires:  %{getsoname /usr/%{_lib}/libjack.so}()(64bit)}
-%else
-%{?with_jack:Requires:	%{getsoname /usr/%{_lib}/libjack.so}}
-%endif
-
-%description drv-jack
-JACK driver for WINE mm.dll (multimedia system) implementation.
-
-%description drv-jack -l pl.UTF-8
-Sterownik JACK-a dla implementacji mm.dll (systemu multimediów) w
-Wine.
-
-%package drv-nas
-Summary:	NAS driver for WINE mm.dll implementation
-Summary(pl.UTF-8):	Sterownik NAS dla implementacji mm.dll w Wine
-Group:		Applications/Emulators
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description drv-nas
-NAS driver for WINE mm.dll (multimedia system) implementation.
-
-%description drv-nas -l pl.UTF-8
-Sterownik NAS dla implementacji mm.dll (systemu multimediów) w Wine.
-
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -300,24 +273,21 @@
 	--enable-win64 \
 %endif
 	--with%{!?with_alsa:out}-alsa \
-	--with-audioio \
-	--without-capi \
+	--with%{!?with_capi:out}-capi \
 	--with-cms \
 	--with-coreaudio \
 	--with%{!?with_cups:out}-cups \
 	--with-curses \
-	--with%{!?with_esd:out}-esd \
 	--with-fontconfig \
 	--with-freetype \
 	--with-glu \
 	--with-gnutls \
 	--with-gphoto \
 	--with-gsm \
-	--with%{!?with_jack:out}-jack \
+	--with%{!?with_gstreamer:out}-gstreamer \
 	--with-jpeg \
 	--with%{!?with_ldap:out}-ldap \
 	--with-mpg123 \
-	--with%{!?with_nas:out}-nas \
 	--with-opengl \
 	--with-openssl \
 	--with-oss \
@@ -393,7 +363,7 @@
 cd $RPM_BUILD_ROOT%{_libdir}/wine
 for f in *.so; do
 	case $f in
-	d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winejack.drv.so|winenas.drv.so|wldap32.dll.so)
+	d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|wldap32.dll.so)
 		;;
 	*)
 		echo "%attr(755,root,root) %{_libdir}/wine/$f" >> $dir/files.so
@@ -411,10 +381,14 @@
 done
 
 install -d $RPM_BUILD_ROOT%{_winedir}/gecko
+%ifnarch %{x8664}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
+%else
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_winedir}/gecko
+%endif
 
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
@@ -448,45 +422,54 @@
 %lang(sv) %doc documentation/README.sv
 %lang(tr) %doc documentation/README.tr
 %attr(755,root,root) %{_bindir}/msiexec
+%ifnarch %{x8664}
+%attr(755,root,root) %{_bindir}/wine
+%else
+%attr(755,root,root) %{_bindir}/wine64
+%endif
 %attr(755,root,root) %{_bindir}/wineboot
 %attr(755,root,root) %{_bindir}/winedbg
 %attr(755,root,root) %{_bindir}/winecfg
-%attr(755,root,root) %{_bindir}/wineserver
-%ifarch %{x8664}
-%attr(755,root,root) %{_bindir}/wine64
-%else
-%attr(755,root,root) %{_bindir}/wine
+%ifnarch %{x8664}
 %attr(755,root,root) %{_bindir}/wine-preloader
+%else
+%attr(755,root,root) %{_bindir}/wine64-preloader
 %endif
+%attr(755,root,root) %{_bindir}/wineserver
 %attr(755,root,root) %{_libdir}/*.so*
 %dir %{_libdir}/wine
 %dir %{_libdir}/wine/fakedlls
 %{_libdir}/wine/fakedlls/*.acm
 %{_libdir}/wine/fakedlls/*.cpl
 %{_libdir}/wine/fakedlls/*.dll
+%ifarch %{ix86}
+%{_libdir}/wine/fakedlls/*.dll16
+%endif
 %{_libdir}/wine/fakedlls/*.drv
+%ifarch %{ix86}
+%{_libdir}/wine/fakedlls/*.drv16
+%endif
 %{_libdir}/wine/fakedlls/*.ds
 %{_libdir}/wine/fakedlls/*.exe
+%ifarch %{ix86}
+%{_libdir}/wine/fakedlls/*.exe16
+%{_libdir}/wine/fakedlls/*.mod16
+%endif
 %{_libdir}/wine/fakedlls/*.ocx
 %{_libdir}/wine/fakedlls/*.sys
 %{_libdir}/wine/fakedlls/*.tlb
 %ifarch %{ix86}
-%{_libdir}/wine/fakedlls/*.dll16
-%{_libdir}/wine/fakedlls/*.drv16
-%{_libdir}/wine/fakedlls/*.exe16
-%{_libdir}/wine/fakedlls/*.mod16
 %{_libdir}/wine/fakedlls/*.vxd
 %endif
 %{_mandir}/man1/wine.1*
+%lang(de) %{_mandir}/de/man1/wine*.1*
+%lang(fr) %{_mandir}/fr/man1/wine*.1*
+%lang(pl) %{_mandir}/pl/man1/wine*.1*
 %{_mandir}/man1/msiexec.1*
 %{_mandir}/man1/wineboot.1*
 %{_mandir}/man1/winecfg.1*
-%lang(de) %{_mandir}/de/man1/wine.1*
-%lang(fr) %{_mandir}/fr/man1/wine.1*
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineserver.1*
-%lang(de) %{_mandir}/de/man1/wineserver.1*
-%lang(fr) %{_mandir}/fr/man1/wineserver.1*
 %{_winedir}
 %{_desktopdir}/wine.desktop
 %{_desktopdir}/wine-uninstaller.desktop
@@ -513,6 +496,7 @@
 %{_libdir}/wine/lib*.def.a
 %{_libdir}/wine/libadsiid.a
 %{_libdir}/wine/libdx*.a
+%{_libdir}/wine/libstrmbase.a
 %{_libdir}/wine/libstrmiids.a
 %{_libdir}/wine/libuuid.a
 %{_libdir}/wine/libwinecrt0.a
@@ -530,6 +514,10 @@
 %{_mandir}/man1/wrc.1*
 %{_aclocaldir}/*.m4
 
+%files dll-capi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/wine/capi2032.dll.so
+
 %files dll-d3d
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/wine/d3d8.dll.so
@@ -560,18 +548,6 @@
 %attr(755,root,root) %{_libdir}/wine/winealsa.drv.so
 %endif
 
-%if %{with jack}
-%files drv-jack
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wine/winejack.drv.so
-%endif
-
-%if %{with nas}
-%files drv-nas
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wine/winenas.drv.so
-%endif
-
 # additional dependencies in *.so not separated (yet?) from main package
 #   ddraw.dll.so,x11drv.dll.so depend on X11 libs
 #   ole2disp.dll.so,oleaut32.dll.so,typelib.dll.so depend on lib(un)gif,libjpeg,libX11
@@ -583,42 +559,182 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.403  2012/01/18 23:36:29  glen
-- without hal
+Revision 1.404  2012/04/10 15:06:29  mmazur
+- updated to the currently stable 1.4 (taken from DEVEL)
+- works for me, so rel1 and stbr I guess
+
+Revision 1.391.2.53  2012/04/10 13:07:49  mmazur
+- up to 1.5.1, current dev version
+
+Revision 1.391.2.52  2012/02/27 14:44:09  lisu
+- up to 1.4-rc5
 
-Revision 1.402  2012/01/18 23:31:15  glen
+Revision 1.391.2.51  2012/02/17 23:13:37  lisu
+- up to 1.4-rc4
+
+Revision 1.391.2.50  2012/02/12 21:30:21  lisu
+- updated to 1.4-rc3
+
+Revision 1.391.2.49  2012/01/18 22:54:21  glen
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/wine/wine-ca_certificates.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/wine/wine-manpaths.patch?r1=1.7&r2=1.8
    http://cvs.pld-linux.org/packages/wine/wine-ncurses.patch?r1=1.10&r2=1.11
    http://cvs.pld-linux.org/packages/wine/wine-uninstaller.desktop?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/wine/wine.spec?r1=1.403&r2=1.404



More information about the pld-cvs-commit mailing list