Reslove merge conflict

OSMesa/Makefile

@@ -16,7 +16,7 @@ endif
 
 LDLIBDIRS = -L../../TCFoundation -L../../TRE -L../../LDLoader -L../../LDLib -L../../LDExporter
 LIBDIRS = $(LDLIBDIRS) -L/usr/X11R6/lib
-LIBS = -lLDraw$(POSTFIX) -lTRE$(POSTFIX) -lLDLoader$(POSTFIX) -lTCFoundation$(POSTFIX) -lLDExporter$(POSTFIX) -lgl2ps -l$(LIB_PNG) -lz -lOSMesa -lGLU -lGL -ljpeg -ltinyxml -L ../../lib
+LIBS = -lLDraw$(POSTFIX) -lTRE$(POSTFIX) -lLDLoader$(POSTFIX) -lTCFoundation$(POSTFIX) -lLDExporter$(POSTFIX) -lgl2ps -l$(LIB_PNG) -lz -lOSMesa -lGLU -lGL -ljpeg -ltinyxml -L ../../lib -lminizip
 LIBS += -lEGL
 STATIC =
 ARCH32 =

QT/LDView.spec

@@ -143,7 +143,7 @@ BuildRequires: libjpeg-turbo-devel, tinyxml-devel, gl2ps-devel
 %endif
 
 %if 0%{?suse_version}
-BuildRequires: cmake, update-desktop-files, glu-devel, Mesa-devel, tinyxml-devel
+BuildRequires: cmake, update-desktop-files, glu-devel, Mesa-devel, tinyxml-devel, hostname, minizip-devel
 BuildRequires: Mesa-libEGL-devel
 %if 0%{?is_opensuse}
 BuildRequires: extra-cmake-modules, kio-devel, kdelibs4support

QT/OBS/LDView-qt5.dsc

@@ -3,7 +3,7 @@ Source: ldview
 Version: 4.4
 Binary: ldview
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), qtbase5-dev, qt5-qmake, libqt5opengl5-dev, cmake, libgl1-mesa-dev, libpng-dev, libglu1-mesa-dev, libjpeg-dev, libosmesa6-dev, libegl-dev, libtinyxml-dev, libgl2ps-dev, extra-cmake-modules, libkf5kio-dev, libkf5kdelibs4support5-bin, qttools5-dev-tools
+Build-Depends: debhelper (>= 4.1.16), qtbase5-dev, qt5-qmake, libqt5opengl5-dev, cmake, libgl1-mesa-dev, libpng-dev, libglu1-mesa-dev, libjpeg-dev, libosmesa6-dev, libegl-dev, libtinyxml-dev, libgl2ps-dev, extra-cmake-modules, libkf5kio-dev, libkf5kdelibs4support5-bin, qttools5-dev-tools, libminizip-dev
 Maintainer: Peter Bartfai <[email protected]>
 Files:
  d57283ebb8157ae919762c5841935312 6900000 LDView.tar.gz