packages: wine/wine.spec - ensure proper libpng at runtime (does this need ...

[glen]

Author: glen                         Date: Fri May 11 16:15:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ensure proper libpng at runtime (does this need lib64 qualifier?)

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

---- Diffs:

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.404 packages/wine/wine.spec:1.405
--- packages/wine/wine.spec:1.404	Tue Apr 10 17:06:29 2012
+++ packages/wine/wine.spec	Fri May 11 18:15:53 2012
@@ -16,8 +16,9 @@
 #   libfreetype (wineps.dll.so,gdi32.dll.so)
 #   libGL (x11drv.dll.so,ddraw.dll.so)
 #   libX11, libXext, libXi, libXrender (x11drv.dll.so)
+#   libpng (windowscodecs.dll: SONAME_LIBPNG in dlls/windowscodecs/pngformat.c)
 # thus requires rebuild after change of any of the above.
-#
+
 %define		gecko_ver	1.4
 Summary:	Program that lets you launch Win applications
 Summary(es.UTF-8):	Ejecuta programas Windows en Linux
@@ -74,6 +75,7 @@
 BuildRequires:	libxslt-devel
 BuildRequires:	ncurses-devel
 # db2* failed previously - probably openjade or opensp bug
+BuildRequires:	libpng-devel >= 1.5
 BuildRequires:	openjade >= 1:1.3.3-0.pre1
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	opensp >= 1:1.5.1
@@ -93,6 +95,7 @@
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 Requires:	libfreetype.so.6
+Requires:	libpng15.so.15
 Requires(post):	/sbin/ldconfig
 Suggests:	binfmt-detector
 Suggests:	ca-certificates
@@ -233,7 +236,7 @@
 Biblioteka DLL z implementacją TWAIN dla Wine (poprzez SANE).
 
 %package dll-ldap
-Summary:	Win32 LDAP API DLL for Wine.
+Summary:	Win32 LDAP API DLL for Wine
 Group:		Applications/Emulators
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -253,7 +256,7 @@
 Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -382,20 +385,20 @@
 
 install -d $RPM_BUILD_ROOT%{_winedir}/gecko
 %ifnarch %{x8664}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
 %else
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_winedir}/gecko
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_winedir}/gecko
 %endif
 
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
- /sbin/ldconfig
+/sbin/ldconfig
 %update_desktop_database
 
 %postun -p /sbin/ldconfig
@@ -559,6 +562,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.405  2012/05/11 16:15:53  glen
+- ensure proper libpng at runtime (does this need lib64 qualifier?)
+
 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
================================================================

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