Author: lisu Date: Fri Jul 29 14:03:18 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- get rid of Jack, NAS and ESD drivers (obsoleted, dropped by upstream)
---- Files affected:
packages/wine:
wine.spec (1.391.2.34 -> 1.391.2.35)
---- Diffs:
================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.391.2.34 packages/wine/wine.spec:1.391.2.35
--- packages/wine/wine.spec:1.391.2.34 Fri Jul 29 14:51:45 2011
+++ packages/wine/wine.spec Fri Jul 29 16:03:13 2011
@@ -2,11 +2,8 @@
#
# Conditional build:
%bcond_without alsa # don't build ALSA mm driver
-%bcond_with esd # build ESD mm driver
%bcond_without capi # don't build CAPI 2.0 (ISDN) support
%bcond_without gstreamer # don't build GStreamer filters support
-%bcond_without jack # don't build JACK mm driver
-%bcond_without nas # don't build NAS mm driver
%bcond_without sane # don't build TWAIN DLL with scanning support
(through SANE)
%bcond_without cups # without CUPS printing support in
winspool,wineps DLLs
#
@@ -17,15 +14,9 @@
# 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
-
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
@@ -62,7 +53,6 @@
%{?with_cups:BuildRequires: cups-devel}
BuildRequires: docbook-dtd31-sgml
BuildRequires: docbook-utils
-%{?with_esd:BuildRequires: esound-devel}
BuildRequires: flex
BuildRequires: fontconfig-devel
BuildRequires: fontforge
@@ -73,7 +63,6 @@
%{?with_gstreamer:BuildRequires: gstreamer-plugins-base-devel}
BuildRequires: hal-devel
BuildRequires: icoutils
-%{?with_jack:BuildRequires: jack-audio-connection-kit-devel}
BuildRequires: lcms-devel
BuildRequires: libgphoto2-devel
BuildRequires: libgsm-devel
@@ -82,7 +71,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
@@ -252,34 +240,6 @@
%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
-%{?with_jack:Requires: %{getsoname %{_libdir}/libjack.so}}
-
-%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
%patch0 -p1
@@ -307,7 +267,6 @@
--with-coreaudio \
--with%{!?with_cups:out}-cups \
--with-curses \
- --with%{!?with_esd:out}-esd \
--with-fontconfig \
--with-freetype \
--with-glu \
@@ -316,11 +275,9 @@
--with-gsm \
--with%{!?with_gstreamer:out}-gstreamer \
--with-hal \
- --with%{!?with_jack:out}-jack \
--with-jpeg \
--with-ldap \
--with-mpg123 \
- --with%{!?with_nas:out}-nas \
--with-opengl \
--with-openssl \
--with-oss \
@@ -396,7 +353,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)
+
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)
;;
*)
echo "%attr(755,root,root) %{_libdir}/wine/$f" >> $dir/files.so
@@ -571,18 +528,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
@@ -594,6 +539,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.391.2.35 2011/07/29 14:03:13 lisu
+- get rid of Jack, NAS and ESD drivers (obsoleted, dropped by upstream)
+
Revision 1.391.2.34 2011/07/29 12:51:45 lisu
- updated to 1.3.25
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine.spec?r1=1.391.2.34&r2=1.391.2.35&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
