Hello community, here is the log from the commit of package ddiwrapper checked in at Thu Jun 21 19:57:58 CEST 2007. -------- --- arch/i386/ddiwrapper/ddiwrapper.changes 2007-04-27 14:48:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddiwrapper/ddiwrapper.changes 2007-06-21 16:58:29.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 21 16:55:57 CEST 2007 - uli@suse.de + +- appease rpmlint (fix (unused) code in WINE, remove DLLs from + /usr/share, disable ldconfig error for private libraries) + +------------------------------------------------------------------- New: ---- ddiwrapper-dllstolib.patch rpmlintrc wine-advpackstrcmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.v10362/_old 2007-06-21 19:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.v10362/_new 2007-06-21 19:54:01.000000000 +0200 @@ -16,18 +16,21 @@ Group: Hardware/Printing Autoreqprov: on Version: 0.2 -Release: 67 +Release: 77 Summary: Support for Windows Printer Drivers under Linux Source: %name-%version.tar.gz Source1: wine-20050524.tar.bz2 Source3: README.SuSE Source4: stdole32.tlb +Source666: rpmlintrc Patch1: wine-20050524.diff Patch2: wine-CLK_TCK.patch Patch3: wine-winebuild_off_by_one.patch Patch4: wine-alsa.patch Patch5: wine-a_ptr.patch Patch6: wine-HZ.patch +Patch7: wine-advpackstrcmp.patch +Patch8: ddiwrapper-dllstolib.patch # not used ATM, needed for more recent WINEs Patch42: ddiwrapper-newwine.patch Patch: ddiwrapper-winepath.patch @@ -53,6 +56,7 @@ %prep %setup -n %name -a 1 %patch0 +%patch8 cd wine-* %patch1 -p1 %patch2 -p1 @@ -60,6 +64,7 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p1 mv LICENSE LICENSE.wine sed s,yystr,xxyystr,g <tools/wrc/parser.l >p.l && mv p.l tools/wrc/parser.l cp %SOURCE3 . @@ -115,7 +120,8 @@ /usr/sbin/excanondriver %dir /usr/share/ddiwrapper /usr/share/ddiwrapper/createwineconf -/usr/share/ddiwrapper/dlls +%dir /usr/lib/ddiwrapper +/usr/lib/ddiwrapper/dlls %dir /usr/share/ddiwrapper/drivers %config /usr/share/ddiwrapper/wine.config %dir /usr/share/cups @@ -125,6 +131,9 @@ %_libdir/ddiwrapper/wine %changelog +* Thu Jun 21 2007 - uli@suse.de +- appease rpmlint (fix (unused) code in WINE, remove DLLs from + /usr/share, disable ldconfig error for private libraries) * Fri Apr 27 2007 - uli@suse.de - does not work with recent WINEs any more; added custom minimal WINE build ++++++ ddiwrapper-dllstolib.patch ++++++ --- Makefile +++ Makefile @@ -65,15 +65,16 @@ options.o: common.h INSTDIR = $(DESTDIR)/usr/share/ddiwrapper +DLLDIR= $(DESTDIR)/usr/lib/ddiwrapper/dlls install: all install -d -m 755 $(INSTDIR) install -d -m 755 $(INSTDIR)/drivers install -m 644 wine.config $(INSTDIR) install -m 755 tools/createwineconf $(INSTDIR) - install -d -m 755 $(INSTDIR)/dlls - install -m 755 winspool/winspool.drv.so $(INSTDIR)/dlls - install -m 755 gdi32/gdi32.dll.so $(INSTDIR)/dlls + install -d -m 755 $(DLLDIR) + install -m 755 winspool/winspool.drv.so $(DLLDIR) + install -m 755 gdi32/gdi32.dll.so $(DLLDIR) install -m 755 ddiwrapper.exe.so $(DESTDIR)/usr/bin install -m 755 tools/ddiwrapper $(DESTDIR)/usr/bin install -m 755 tools/msexpand $(DESTDIR)/usr/bin --- tools/ddiwrapper +++ tools/ddiwrapper @@ -12,6 +12,6 @@ # run the ddiwrapper binary LD_LIBRARY_PATH=/usr/lib/ddiwrapper/wine/lib \ -WINEDLLPATH=/usr/share/ddiwrapper/dlls \ +WINEDLLPATH=/usr/lib/ddiwrapper/dlls \ WINEPREFIX=$HOME/.ddiwrapper \ /usr/lib/ddiwrapper/wine/bin/wine /usr/bin/ddiwrapper.exe.so "$@" ++++++ wine-advpackstrcmp.patch ++++++ --- wine-20050524/dlls/advpack/advpack.c +++ wine-20050524/dlls/advpack/advpack.c @@ -274,7 +274,7 @@ int fname_len = lstrlenA(fname); /* Generate a path with wildcard suitable for iterating */ - if (CharPrevA(fname, fname + fname_len) != "\\") + if (!lstrcmpA(CharPrevA(fname, fname + fname_len), "\\")) { lstrcpyA(fname + fname_len, "\\"); ++fname_len; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org