public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/zmap] rawhide: spec cleanup, enable tests
@ 2026-06-19  2:41 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-06-19  2:41 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/zmap
            Branch : rawhide
            Commit : f210251e36e0f9c35fabdc0deae1890beb3da3fe
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-18T23:40:59-03:00
            Stats  : +11/-10 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/zmap/c/f210251e36e0f9c35fabdc0deae1890beb3da3fe?branch=rawhide

            Log:
            spec cleanup, enable tests

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/zmap-bin-sbin-merge.patch b/zmap-bin-sbin-merge.patch
index 7b6fdae..e03fd17 100644
--- a/zmap-bin-sbin-merge.patch
+++ b/zmap-bin-sbin-merge.patch
@@ -1,5 +1,5 @@
---- src/CMakeLists.txt-orig     2025-05-12 18:12:45.000000000 -0300
-+++ src/CMakeLists.txt  2025-11-09 02:34:07.156908310 -0300
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -274,7 +274,7 @@
      zblocklist
      ziterate

diff --git a/zmap.spec b/zmap.spec
index 2debb18..e3b87da 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -1,4 +1,3 @@
-%global __cmake_in_source_build 1
 %bcond_with     pfring
 %bcond_without  debug
 
@@ -6,11 +5,10 @@ Name:           zmap
 Version:        4.4.0
 Release:        %autorelease
 Summary:        Network scanner for Internet-wide network studies
-# Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:        Apache-2.0
 URL:            https://zmap.io
 Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         zmap-bin-sbin-merge.patch
+Patch:          zmap-bin-sbin-merge.patch
 BuildRequires:  byacc
 BuildRequires:  cmake
 BuildRequires:  flex
@@ -21,6 +19,8 @@ BuildRequires:  json-c-devel
 BuildRequires:  Judy-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libunistring-devel
+BuildRequires:  make
+BuildRequires:  ninja-build
 
 %description
 ZMap is an open-source network scanner that enables researchers to easily 
@@ -41,22 +41,23 @@ respect requests to stop scanning and to exclude these networks from ongoing
 scanning.
 
 %prep
-%autosetup -p 0
+%autosetup -p1
+chmod 644 -v examples/udp-probes/*
+find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
 
 %build
 %cmake -DENABLE_DEVELOPMENT=OFF           \
        -DENABLE_LOG_TRACE=OFF             \
        -DWITH_JSON=ON                     \
        -DWITH_PFRING=OFF
-
 %cmake_build
 
-chmod 644 -v examples/udp-probes/*
-find ./examples/ -type f -exec sed -i 's/\r$//' {} \+
-
 %install
 %cmake_install
 
+%check
+%make_build -C test/unit run CC=%{__cc} CFLAGS="%{optflags} -I../../src"
+
 %files
 %doc AUTHORS CHANGELOG.md README.md examples/
 %license LICENSE

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-19  2:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-19  2:41 [rpms/zmap] rawhide: spec cleanup, enable tests Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox