packages: wine/wine.spec - restore library qualifier (lost in r1.404 merge)

glen glen at pld-linux.org
Fri May 11 18:41:32 CEST 2012


Author: glen                         Date: Fri May 11 16:41:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore library qualifier (lost in r1.404 merge)

---- Files affected:
packages/wine:
   wine.spec (1.405 -> 1.406) 

---- Diffs:

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.405 packages/wine/wine.spec:1.406
--- packages/wine/wine.spec:1.405	Fri May 11 18:15:53 2012
+++ packages/wine/wine.spec	Fri May 11 18:41:27 2012
@@ -19,6 +19,13 @@
 #   libpng (windowscodecs.dll: SONAME_LIBPNG in dlls/windowscodecs/pngformat.c)
 # thus requires rebuild after change of any of the above.
 
+# library qualifier in rpm generated deps
+%ifarch %{x8664} ia64 ppc64 s390x sparc64
+%define	libqual ()(64bit)
+%else
+%define	libqual %{nil}
+%endif
+
 %define		gecko_ver	1.4
 Summary:	Program that lets you launch Win applications
 Summary(es.UTF-8):	Ejecuta programas Windows en Linux
@@ -94,8 +101,8 @@
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
-Requires:	libfreetype.so.6
-Requires:	libpng15.so.15
+Requires:	libfreetype.so.6%{libqual}
+Requires:	libpng15.so.15%{libqual}
 Requires(post):	/sbin/ldconfig
 Suggests:	binfmt-detector
 Suggests:	ca-certificates
@@ -562,6 +569,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.406  2012/05/11 16:41:27  glen
+- restore library qualifier (lost in r1.404 merge)
+
 Revision 1.405  2012/05/11 16:15:53  glen
 - ensure proper libpng at runtime (does this need lib64 qualifier?)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/wine/wine.spec?r1=1.405&r2=1.406



More information about the pld-cvs-commit mailing list