Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ois for openSUSE:Factory checked in at 2021-06-01 10:38:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ois (Old) and /work/SRC/openSUSE:Factory/.ois.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ois" Tue Jun 1 10:38:43 2021 rev:4 rq:896165 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ois/ois.changes 2017-12-31 01:13:24.417347692 +0100 +++ /work/SRC/openSUSE:Factory/.ois.new.1898/ois.changes 2021-06-01 10:40:20.925107957 +0200 @@ -1,0 +2,17 @@ +Mon May 3 22:10:04 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 1.5 + * Clean CMake based build system + * CapsLock and NumLock are modifiers bits + * Improved Linux keyboard support (should not depend on the X11 + current keyboard layout anymore) + * Added clang-format for consistent coding style + * Diverse code cleaning and housekeeping changes +- Using cmake instead of autoconf +- Fixed sub package names to match so version +- Drop upstream fixed ois-gcc47.patch +- Add upstream patches + * 0001-Install-headers-from-CMAKE_CURRENT_SOURCE_DIR-instea.patch + * 0001-CMakeLists.txt-Respect-user-s-libdir.patch + +------------------------------------------------------------------- Old: ---- ois-1.3.0.tar.bz2 ois-gcc47.patch New: ---- 0001-CMakeLists.txt-Respect-user-s-libdir.patch 0001-Install-headers-from-CMAKE_CURRENT_SOURCE_DIR-instea.patch OIS-1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ois.spec ++++++ --- /var/tmp/diff_new_pack.H6zhj2/_old 2021-06-01 10:40:21.513108958 +0200 +++ /var/tmp/diff_new_pack.H6zhj2/_new 2021-06-01 10:40:21.517108964 +0200 @@ -1,7 +1,7 @@ # # spec file for package ois # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,40 +12,40 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 1_3_0 - +%define sover 1_5_0 Name: ois -Version: 1.3.0 +Version: 1.5 Release: 0 Summary: Object Oriented Input System License: Zlib Group: System/Libraries -Url: http://sourceforge.net/projects/wgois -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM ois-gcc47.patch -Patch0: %{name}-gcc47.patch +URL: https://wgois.github.io/OIS/ +Source0: https://github.com/wgois/OIS/archive/refs/tags/v%{version}.tar.gz#/OIS-%{version}.tar.gz +# PATCH-FIX-UPSTREAM 0001-Install-headers-from-CMAKE_CURRENT_SOURCE_DIR-instea.patch -- https://github.com/wgois/OIS/pull/64 +Patch0: 0001-Install-headers-from-CMAKE_CURRENT_SOURCE_DIR-instea.patch +# PATCH-FIX-UPSTREAM 0001-CMakeLists.txt-Respect-user-s-libdir.patch -- https://github.com/wgois/OIS/pull/69 +Patch1: 0001-CMakeLists.txt-Respect-user-s-libdir.patch +BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Object Oriented Input System (OIS) is a solution for using all kinds of Input Devices (Keyboards, Mice, Joysticks, etc) and feedback devices (e.g. forcefeedback). -%package -n libOIS-%{sover} +%package -n libOIS%{sover} Summary: Object Oriented Input System development package Group: System/Libraries -%description -n libOIS-%{sover} +%description -n libOIS%{sover} Object Oriented Input System (OIS) is a solution for using all kinds of Input Devices (Keyboards, Mice, Joysticks, etc) and feedback devices (e.g. forcefeedback). @@ -53,8 +53,7 @@ %package -n libOIS-devel Summary: Object Oriented Input System development package Group: Development/Libraries/C and C++ -Requires: libOIS-%{sover} = %{version} -Requires: libstdc++-devel +Requires: libOIS%{sover} = %{version} %description -n libOIS-devel Object Oriented Input System (OIS) is a solution for using all kinds @@ -62,36 +61,28 @@ devices (e.g. forcefeedback). %prep -%setup -q -n ois -%patch0 -p1 -chmod +x bootstrap -dos2unix ReadMe.txt +%autosetup -p1 -n OIS-%{version} %build -./bootstrap -%if 0%{?suse_version} <= 1010 -export LDFLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}" +%cmake \ +%if 0%{?sle_version} == 150200 + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ %endif -export LDFLAGS="$LDFLAGS -Wl,--no-undefined" -export CXXFLAGS="%optflags -fvisibility-inlines-hidden" -%configure --disable-static -make %{?_smp_mflags} + -DOIS_BUILD_SHARED_LIBS=ON +%cmake_build %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install -rm -f %{buildroot}%{_libdir}/lib*.la +%cmake_install -%post -n libOIS-%{sover} -p /sbin/ldconfig -%postun -n libOIS-%{sover} -p /sbin/ldconfig +%post -n libOIS%{sover} -p /sbin/ldconfig +%postun -n libOIS%{sover} -p /sbin/ldconfig -%files -n libOIS-%{sover} -%defattr(0644,root,root) -%{_libdir}/libOIS-%{version}.so +%files -n libOIS%{sover} +%license LICENSE.md +%{_libdir}/libOIS.so.* %files -n libOIS-devel -%defattr(-,root,root) -%doc ReadMe.txt -%{_includedir}/OIS +%{_includedir}/ois %{_libdir}/libOIS.so %{_libdir}/pkgconfig/OIS.pc ++++++ 0001-CMakeLists.txt-Respect-user-s-libdir.patch ++++++ >From 0536741549a157627d4306f6e19f1cc5cb52cef8 Mon Sep 17 00:00:00 2001 From: Sam James <s...@gentoo.org> Date: Sat, 27 Feb 2021 15:03:33 +0000 Subject: [PATCH] CMakeLists.txt: Respect user's libdir Without this patch, on systems where /usr/lib64/ is used (e.g. Gentoo), libraries are installed to /usr/lib/ despite the standard CMake arguments being passed. It's not exactly clear what *the* canonical way is to take libdir parameters in CMake, but GNUInstallDirs mostly handles it for the *NIX case. To be minimally invasive here, I've only changed the *NIX path and aligned as much of the logic as possible. Signed-off-by: Sam James <s...@gentoo.org> --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56b1c49..c4ce5a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS) endif() -set(LIB_INSTALL_DIR "lib") +if(UNIX) + include(GNUInstallDirs) + set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) +else() + set(LIB_INSTALL_DIR "lib") +endif() + set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h") @@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS} install(TARGETS OIS RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} FRAMEWORK DESTINATION Library/Frameworks ) -- 2.26.2 ++++++ 0001-Install-headers-from-CMAKE_CURRENT_SOURCE_DIR-instea.patch ++++++ >From 5ef80a60ce20ad40ae90343c393079262354997d Mon Sep 17 00:00:00 2001 From: Yoann Potinet <yoann.poti...@gmail.com> Date: Fri, 14 Aug 2020 16:18:47 -0400 Subject: [PATCH] Install headers from CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e16031d..56b1c49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,7 @@ endif() set(LIB_INSTALL_DIR "lib") set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) -file(GLOB PUBLIC_HEADERS "${CMAKE_SOURCE_DIR}/includes/*.h") +file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h") install(FILES ${PUBLIC_HEADERS} DESTINATION include/ois -- 2.26.2
