libdrm,wine: new upstream release, libpciaccess: create compat32 sub packages

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4309 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libd/libdrm/libdrm-vl.spec

@@ -3,8 +3,8 @@
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
-Version: 2.4.25
-Release: 2%{?_dist_release}
+Version: 2.4.26
+Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -13,12 +13,13 @@ Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
 Source2: 91-drm-modeset.rules
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch5: libdrm-2.4.25-libkms_against_in_tree_drm.patch
-Patch10: libdrm-2.4.16-no-pthread-stubs.patch
+Patch10: libdrm-2.4.26-no-pthread-stubs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig automake autoconf libtool
 BuildRequires: libxcb-devel
-BuildRequires: udev
+BuildRequires: libpciaccess-devel
+BuildRequires: libudev-devel
 BuildRequires: kernel-headers >= 2.6.27-1
 
 Vendor: Project Vine
@@ -161,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Jul 09 2011 Yoji TOYODA <bsyamato@aea.plala.or.jp> 2.4.26-1
+- new upstream release
+- add BuildRequires: libpciaccess-devel
+- change BuildRequires: libudev-devel instead of udev
+- update Patch10
+
 * Mon May 16 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.25-2
 - add patch5 to build libkms with in-tree libdrm
 - add --enable-vmwgfx-experimental-api

lib/libp/libpciaccess/libpciaccess-vl.spec

@@ -1,8 +1,10 @@
+%define build_compat32  %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Name:           libpciaccess
 Summary:        PCI access library
 Summary(ja):    PCI アクセスライブラリ
 Version:        0.12.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        MIT
@@ -33,6 +35,29 @@ Requires:       pkgconfig
 %description devel
 Development package for libpciaccess.
 
+
+# compat32
+%package -n compat32-%{name}
+Summary:        PCI access library
+Summary(ja):    PCI アクセスライブラリ
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+libpciaccess is a library for portable PCI access routines across multiple
+operating systems.
+
+%package -n compat32-%{name}-devel
+Summary:        PCI access library development package
+Summary(ja):    PCI access library 開発パッケージ
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       pkgconfig
+
+%description -n compat32-%{name}-devel
+Development package for libpciaccess.
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .wc
@@ -66,7 +91,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpciaccess.so
 %{_libdir}/pkgconfig/pciaccess.pc
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/libpciaccess.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpciaccess.so
+%{_libdir}/pkgconfig/pciaccess.pc
+%endif
+
 %changelog
+* Sat Jul 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.1-2
+- create compat32 sub packages
+
 * Sat Feb 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12.1-1
 - new upstream release
 

w/wine/wine-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_major_version 1.2.2
+%define pkg_major_version 1.2.3
 %define pkg_name wine
 %define pkg_release 1%{?_dist_release}
 
@@ -78,7 +78,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 ## FedoraCore ##
 BuildRequires: bison, flex
 BuildRequires: audiofile, audiofile-devel
-BuildRequires: alsa-lib-devel, esound-devel
+BuildRequires: alsa-lib-devel
 BuildRequires: freeglut-devel, lcms-devel
 ## BuildRequires:  libieee1284-devel
 BuildRequires: libjpeg-devel, libpng-devel
@@ -134,6 +134,7 @@ BuildRequires: compat32-openssl-devel
 BuildRequires: compat32-libjpeg-devel
 BuildRequires: compat32-libpng-devel
 BuildRequires: compat32-zlib-devel
+BuildRequires: compat32-alsa-lib-devel
 ## extension
 BuildRequires: compat32-libXcursor-devel
 BuildRequires: compat32-libXi-devel
@@ -145,6 +146,8 @@ BuildRequires: compat32-ncurses-devel
 BuildRequires: compat32-fontconfig-devel
 BuildRequires: compat32-libtiff-devel
 BuildRequires: compat32-openldap-devel
+
+Requires:	compat32-freetype2
 %endif
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service
@@ -542,6 +545,10 @@ fi
 
 #--------------------------------------------------------------------
 %changelog
+* Sat Jul 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.3-1
+- update to 1.2.3
+- add Requires: compat32-freetype2 (x86_64 only)
+
 * Sat Dec 04 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.2-1
 - new upstream release