From ac9154966893b541983fa8bc751b241f096d5ade Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Jul 20 2019 11:32:10 +0000 Subject: - Fix FTBFS + spec cleanup rhbz#1606590 and rhbz#1676166 --- diff --git a/tunneler-1.1.1-inline.patch b/tunneler-1.1.1-inline.patch new file mode 100644 index 0000000..046feda --- /dev/null +++ b/tunneler-1.1.1-inline.patch @@ -0,0 +1,13 @@ +--- tunneler-1.1.1/src/tunneler.c-orig 2008-05-14 10:32:34.000000000 -0300 ++++ tunneler-1.1.1/src/tunneler.c 2019-07-20 08:20:54.109554969 -0300 +@@ -380,7 +380,8 @@ + } + + +-inline void CTest_Sub( int y, int x, int i ) ++//inline void CTest_Sub( int y, int x, int i ) ++void CTest_Sub( int y, int x, int i ) + { + int y0, x0; + + diff --git a/tunneler.spec b/tunneler.spec index c80d840..efdf337 100644 --- a/tunneler.spec +++ b/tunneler.spec @@ -1,6 +1,6 @@ Name: tunneler Version: 1.1.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Clone of legendary Tunneler game License: GPLv2+ @@ -9,6 +9,7 @@ Source0: http://users.jyu.fi/~tvkalvas/code/tunneler/%{name}-%{version}.t Source1: tunneler.svg Source2: tunneler.desktop Patch0: tunneler-1.1.1-lm.patch +Patch1: tunneler-1.1.1-inline.patch BuildRequires: gcc BuildRequires: desktop-file-utils @@ -24,18 +25,17 @@ actually have some searching to do. %prep -%setup -q -%patch0 -p1 -b .lm +%autosetup -p1 %build autoreconf -i %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ desktop-file-install %{SOURCE2} \ @@ -48,10 +48,14 @@ desktop-file-install %{SOURCE2} \ %{_bindir}/tunneler %{_datadir}/icons/hicolor/scalable/apps/tunneler.svg %{_datadir}/applications/*.desktop -%doc COPYING INSTALL README +%doc INSTALL README +%license COPYING %changelog +* Sat Jul 20 2019 Filipe Rosset - 1.1.1-24 +- Fix FTBFS + spec cleanup rhbz#1606590 and rhbz#1676166 + * Sun Feb 03 2019 Fedora Release Engineering - 1.1.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild