fix packing

wine-grdwine.spec

+# TODO:
+%define optflags_lto %nil
+
 Name: wine-grdwine
 Version: 0.5.5.1
-Release: alt1
+Release: alt2
 
 Summary: Guardant usb dongle helper library for Wine
 License: LGPLv2
@@ -13,7 +16,7 @@ Packager: Konstantin Kondratyuk <kondratyuk@altlinux.org>
 # Source-url: https://github.com/Etersoft/grdwine/archive/refs/tags/v%version.tar.gz
 Source: %name-%version.tar
 
-BuildRequires: libwine-devel
+BuildRequires: libwine-devel >= 6.23
 
 ExclusiveArch: %ix86 x86_64
 
@@ -23,8 +26,30 @@ ExclusiveArch: %ix86 x86_64
   %def_without build64
 %endif
 
-%define winelibdir %_libdir/wine
-%add_verify_elf_skiplist %winelibdir/grdwine.dll.so
+
+%define libwinedir %_libdir/wine
+
+# TODO: move to rpm-macros-wine
+# set arch dependent dirs
+%ifarch %{ix86}
+%define winepedir i386-windows
+%define winesodir i386-unix
+%endif
+%ifarch x86_64
+%define winepedir x86_64-windows
+%define winesodir x86_64-unix
+%endif
+%ifarch %{arm}
+%define winepedir arm-windows
+%define winesodir arm-unix
+%endif
+%ifarch aarch64
+%define winepedir aarch64-windows
+%define winesodir aarch64-unix
+%endif
+
+
+%add_verify_elf_skiplist %libwinedir/%winesodir/grdwine.dll.so
 
 %description
 Guardant usb dongle helper library for Wine.
@@ -32,7 +57,7 @@ Implementation of the GrdWine is based on Linux USB Device
 Filesystem and Linux USB HID Device Interface.
 
 Supports Guardant Sign/Time and Guardant Code dongles.
-Old keys Stealth II and Stealth III are not supported
+Old keys Stealth II and Stealth III are not supported here
 (check WINE@Etersoft to get support).
 
 %prep
@@ -49,18 +74,23 @@ Old keys Stealth II and Stealth III are not supported
 %configure \
 %endif
 	--with-wineincs=%_includedir \
-	--with-winedlls=%buildroot/%winelibdir
+	--with-wineso=%buildroot/%libwinedir/%winesodir \
+	--with-winepe=%buildroot/%libwinedir/%winepedir
 
 %make_build
 
 %install
-mkdir -p %buildroot/%winelibdir/
 %makeinstall_std
 
 %files
-%winelibdir/grdwine.dll.so
+%libwinedir/%winesodir/grdwine.dll.so
+%libwinedir/%winepedir/grdwine.dll
 
 %changelog
+* Sat Apr 09 2022 Vitaly Lipatov <lav@altlinux.ru> 0.5.5.1-alt2
+- build and pack wine stub
+- disable LTO (for a time)
+
 * Thu Apr 01 2021 Vitaly Lipatov <lav@altlinux.ru> 0.5.5.1-alt1
 - new version 0.5.5.1 (with rpmrb script)
  + fix build with wine since 6.4

wine-grdwine/configure.ac

@@ -12,11 +12,18 @@ AC_ARG_ENABLE([win64],
 AC_ARG_WITH([winedlls],
         [AC_HELP_STRING([--with-winedlls=PATH],[PATH to install .dll.so for Wine @<:@LIBDIR/wine@:>@])],
         [winedlls="${withval}"],[winedlls="\$(libdir)/wine"])
+AC_ARG_WITH([wineso],
+        [AC_HELP_STRING([--with-wineso=PATH],[PATH to install .dll.so for Wine @<:@LIBDIR/wine@:>@])],
+        [wineso="${withval}"],[wineso="\$(libdir)/wine"])
+AC_ARG_WITH([winepe],
+        [AC_HELP_STRING([--with-winepe=PATH],[PATH to install .dll for Wine @<:@LIBDIR/wine@:>@])],
+        [winepe="${withval}"],[wineso="\$(libdir)/wine"])
 AC_ARG_WITH([wineincs],
         [AC_HELP_STRING([--with-wineincs=PATH],[PATH to Wine C header files @<:@INCLUDEDIR@:>@])],
         [wineincs="${withval}"],[wineincs="\$(includedir)"])
 
-AC_SUBST([winedlls])
+AC_SUBST([wineso])
+AC_SUBST([winepe])
 AC_SUBST([wineincs])
 
 AC_CANONICAL_HOST

wine-grdwine/src/Makefile.am

@@ -11,6 +11,11 @@ grdwine$(EXEEXT):	grdwine.spec grdwine.o grdimpl_linux.o grdwine.dll.so
 grdwine.dll.so:	grdwine.spec grdwine.o grdimpl_linux.o
 		$(WINEGCC) -shared $^ -o $@ -lkernel32
 
-install-am:	grdwine.dll.so
-		$(INSTALL_PROGRAM) $^ $(winedlls)/$^
+grdwine.dll: grdwine.spec
+		$(WINEGCC) -o $@ -Wb,--fake-module -shared $^ -mno-cygwin
+
+install-am:	grdwine.dll.so grdwine.dll
+		$(MKDIR_P) $(winepe) $(wineso)
+		$(INSTALL_PROGRAM) grdwine.dll.so $(wineso)/grdwine.dll.so
+		$(INSTALL_PROGRAM) grdwine.dll $(winepe)/grdwine.dll