commit 32e6e23e75ffd9434ed2d2134e205bb384fd74cc
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Aug 16 18:00:25 2023 +0200
- updated URLs and dependencies, versioned Obsoletes; reenable asserts as
advised by upstream
putty-ndebug-hack.patch | 11 -----------
putty.spec | 25 ++++++++++++++-----------
2 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/putty.spec b/putty.spec
index 72f9646..f2a0cab 100644
--- a/putty.spec
+++ b/putty.spec
@@ -3,27 +3,27 @@ Summary(pl.UTF-8): Zapamiętywanie sesji telnet i SSH
Name: putty
Version: 0.78
Release: 1
-License: MIT-licensed
+License: MIT
Group: X11/Applications/Networking
-Source0:
http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
+Source0:
https://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
# Source0-md5: 6de073540eaf1ee182f9a4da61982211
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/
+URL: https://www.chiark.greenend.org.uk/~sgtatham/putty/
BuildRequires: ImageMagick
BuildRequires: ImageMagick-coder-png
-BuildRequires: gtk+2-devel >= 1:2.0
+BuildRequires: cmake >= 3.7
+BuildRequires: gtk+3-devel >= 3.0
BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python3 >= 1:3.0
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: xorg-lib-libX11-devel
-Obsoletes: putty-X11
-Obsoletes: putty-pterm
-Obsoletes: putty-puttytel
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
+Obsoletes: putty-X11 < 0.58-2
+Obsoletes: putty-pterm < 0.62
+Obsoletes: putty-puttytel < 0.62
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -55,11 +55,13 @@ Ten pakiet zawiera dodatkowe programy dla PuTTY.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
cd build
+# override with no -DNDEBUG (don't disable asserts in putty, some of them can
be security related)
+# (see defs.h:14-23)
+CFLAGS="%{rpmcflags}"
%cmake ..
%{__make}
@@ -73,6 +75,7 @@ done
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
diff --git a/putty-ndebug-hack.patch b/putty-ndebug-hack.patch
deleted file mode 100644
index 6acc2c5..0000000
--- a/putty-ndebug-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/32e6e23e75ffd9434ed2d2134e205bb384fd74cc
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
