diff --git a/.gitignore b/.gitignore index 23e3d70..bcf4c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /0.14.0.tar.gz /wiiuse-e7fcdf8.tar.gz /wiiuse-0.15.4.tar.gz -/wiiuse-0.15.5.tar.gz diff --git a/sources b/sources index cc57e4f..3f6e581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wiiuse-0.15.5.tar.gz) = 51a5abb8473b02a4537a73beb3f0012207294a828c332163ed2e99fa06e9905f590c7a0dc756a9182547c055c9b2218106e0a90dee7373fe33b8187c797cd3b8 +SHA512 (wiiuse-0.15.4.tar.gz) = a57147ec86bbbd245500d438a790a68e4692d23509f1068494040a98fece5b5cf4cb71c09b3c07ef1fdbab608bf0cc25fecb291478e68f3cc127d263fb4c4b6e diff --git a/wiiuse.spec b/wiiuse.spec index 83af511..ed75f64 100644 --- a/wiiuse.spec +++ b/wiiuse.spec @@ -1,14 +1,13 @@ -%undefine __cmake_in_source_build -%global commit dfbe3d2cd21d3d88d7ba9de39cfc8aa901a6041b +%global commit e7fcdf815b11068d9bd2dfc05633018d5792f1f3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: wiiuse -Version: 0.15.5 -Release: 18%{?dist} +Version: 0.15.4 +Release: 2%{?dist} Summary: The wiiuse library is used to access and control multiple Nintendo Wiimotes -License: GPL-3.0-or-later +License: GPLv3+ URL: https://github.com/rpavlik/wiiuse -Source0: https://github.com/rpavlik/wiiuse/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/rpavlik/wiiuse/archive/v0.15.4/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ @@ -39,29 +38,33 @@ Requires: wiiuse = %{version}-%{release} Example programs to test accessing wiiremote controllers %prep -%autosetup -p0 +%autosetup #Convert all relevant files to unix charset for i in CHANGELOG.mkd README.mkd; do dos2unix $i; done for i in example*/*; do dos2unix $i; done for i in src/*; do dos2unix $i; done +mkdir build + %build -%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake_build +pushd build +%cmake .. +%make_build %install # Can't use make install as it is a pathetic copy into fixed paths and won't # work on x86_64 -install -Dpm 0755 %{_vpath_builddir}/src/libwiiuse.so %{buildroot}%{_libdir}/libwiiuse.so.0 +install -Dpm 0755 build/src/libwiiuse.so %{buildroot}%{_libdir}/libwiiuse.so.0 ln -s libwiiuse.so.0 %{buildroot}%{_libdir}/libwiiuse.so install -Dpm 0644 src/wiiuse.h %{buildroot}%{_includedir}/wiiuse.h -install -Dpm 0755 %{_vpath_builddir}/example/wiiuseexample %{buildroot}%{_bindir}/wiiuseexample -install -Dpm 0755 %{_vpath_builddir}/example-sdl/wiiuseexample-sdl %{buildroot}%{_bindir}/wiiuseexample-sdl +install -Dpm 0755 build/example/wiiuseexample %{buildroot}%{_bindir}/wiiuseexample +install -Dpm 0755 build/example-sdl/wiiuseexample-sdl %{buildroot}%{_bindir}/wiiuseexample-sdl chrpath -d %{buildroot}%{_bindir}/wiiuseexample* %files %{_libdir}/libwiiuse.so.0 +%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG.mkd README.mkd @@ -77,67 +80,6 @@ chrpath -d %{buildroot}%{_bindir}/wiiuseexample* %ldconfig_scriptlets %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.15.5-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 0.15.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 0.15.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jul 17 2025 Gwyn Ciesla - 0.15.5-15 -- Cmake fix. - -* Sun Jan 19 2025 Fedora Release Engineering - 0.15.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.15.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.15.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.15.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Feb 28 2023 Gwyn Ciesla - 0.15.5-10 -- migrated to SPDX license - -* Sat Jan 21 2023 Fedora Release Engineering - 0.15.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.15.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.15.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.15.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.15.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 0.15.5-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.15.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.15.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Nov 25 2019 Gwyn Ciesla - 0.15.5-1 -- 0.15.5 - -* Tue Sep 17 2019 Gwyn Ciesla - 0.15.4-4 -- Rebuilt for new freeglut - -* Sat Jul 27 2019 Fedora Release Engineering - 0.15.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Sun Feb 03 2019 Fedora Release Engineering - 0.15.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/wiiuse_fix_soname.patch b/wiiuse_fix_soname.patch new file mode 100644 index 0000000..9b681f8 --- /dev/null +++ b/wiiuse_fix_soname.patch @@ -0,0 +1,12 @@ +diff -uPr wiiuse_v0.12.orig/src/Makefile wiiuse_v0.12/src/Makefile +--- wiiuse_v0.12.orig/src/Makefile 2008-03-02 18:30:04.000000000 -0500 ++++ wiiuse_v0.12/src/Makefile 2010-11-20 17:37:50.987825850 -0500 +@@ -32,7 +32,7 @@ + # + # Linking flags + # +-LDFLAGS = -shared -lm -lbluetooth ++LDFLAGS = -shared -Wl,-soname,libwiiuse.so.0 -lm -lbluetooth + + # + # Target binaries (always created as BIN)