commit 550d3205e9120ecf51254da3ab647e97e23e4c05 Author: Adam Osuchowski <ad...@pld-linux.org> Date: Fri Jul 15 14:16:11 2022 +0200
- up to 0.77 - switch from autotools to cmake - dirty hack for cmake NDEBUG variable putty-ndebug-hack.patch | 11 +++++++++++ putty.spec | 23 +++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) --- diff --git a/putty.spec b/putty.spec index 275418f..f677c92 100644 --- a/putty.spec +++ b/putty.spec @@ -1,15 +1,17 @@ Summary: Remembers telnet and SSH sessions Summary(pl.UTF-8): Zapamiętywanie sesji telnet i SSH Name: putty -Version: 0.73 +Version: 0.77 Release: 1 License: MIT-licensed Group: X11/Applications/Networking Source0: http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz -# Source0-md5: d4a1797763e11e6a77115d0d0368b566 +# Source0-md5: a6ffe10f1a3f63e7bfff0b212244fdf7 Source1: %{name}.desktop Source2: %{name}tel.desktop Source3: pterm.desktop +# DIRTY HACK! +Patch0: %{name}-ndebug-hack.patch URL: http://www.chiark.greenend.org.uk/~sgtatham/putty/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -53,15 +55,15 @@ Ten pakiet zawiera dodatkowe programy dla PuTTY. %prep %setup -q +%patch0 -p1 %build -%{__aclocal} -%{__autoconf} -%{__automake} -%configure +install -d build +cd build +%cmake .. %{__make} -cd icons +cd ../icons for size in 16 32 48 64 96 128 ; do dir=hicolor/${size}x${size}/apps install -d $dir @@ -71,9 +73,12 @@ done %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT +cp -p build/puttytel $RPM_BUILD_ROOT%{_bindir} +cp -p doc/puttytel.1 $RPM_BUILD_ROOT%{_mandir}/man1 + install -d $RPM_BUILD_ROOT{%{_iconsdir},%{_desktopdir}} cp -a icons/hicolor $RPM_BUILD_ROOT%{_iconsdir} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} @@ -110,9 +115,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/plink %attr(755,root,root) %{_bindir}/pscp %attr(755,root,root) %{_bindir}/psftp +%attr(755,root,root) %{_bindir}/psusan %attr(755,root,root) %{_bindir}/puttygen %{_mandir}/man1/pageant.1* %{_mandir}/man1/plink.1* %{_mandir}/man1/pscp.1* %{_mandir}/man1/psftp.1* +%{_mandir}/man1/psusan.1* %{_mandir}/man1/puttygen.1* diff --git a/putty-ndebug-hack.patch b/putty-ndebug-hack.patch new file mode 100644 index 0000000..6acc2c5 --- /dev/null +++ b/putty-ndebug-hack.patch @@ -0,0 +1,11 @@ +--- putty-0.77.orig/defs.h 2022-05-24 18:56:25.000000000 +0200 ++++ putty-0.77/defs.h 2022-07-15 14:06:03.028384200 +0200 +@@ -19,7 +19,7 @@ + * should arrange that we don't ever accidentally compile assertions + * out. + */ +-#error Do not compile this code base with NDEBUG defined! ++//#error Do not compile this code base with NDEBUG defined! + #endif + + #if HAVE_CMAKE_H ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/putty.git/commitdiff/550d3205e9120ecf51254da3ab647e97e23e4c05 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit