[zmap/f20] Update to 1.1.2

Christopher Meng cicku at fedoraproject.org
Mon Jan 27 09:47:24 UTC 2014


commit e69f7637645ef849255b6c08119ca28a58c032db
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jan 27 17:26:37 2014 +0800

    Update to 1.1.2

 zmap-1.1.2-destdir-support.patch |   10 ++++++++++
 zmap.spec                        |    4 +++-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/zmap-1.1.2-destdir-support.patch b/zmap-1.1.2-destdir-support.patch
new file mode 100644
index 0000000..ccefb8a
--- /dev/null
+++ b/zmap-1.1.2-destdir-support.patch
@@ -0,0 +1,10 @@
+--- zmap-1.1.2/zmap_conf_install.cmake.in	2014-01-27 17:22:34.656725241 +0800
++++ zmap-1.1.2/zmap_conf_install.cmake.in.fix	2014-01-27 17:23:38.126873488 +0800
+@@ -1,6 +1,6 @@
+ message(STATUS "Creating /etc/zmap")
+ if (NOT EXISTS "/etc/zmap/")
+-        file(MAKE_DIRECTORY "/etc/zmap")
++        file(INSTALL DESTINATION "/etc/zmap")
+ else()
+         message(STATUS "/etc/zmap exists, skipping...")
+ endif()
diff --git a/zmap.spec b/zmap.spec
index 67e56eb..871bef0 100644
--- a/zmap.spec
+++ b/zmap.spec
@@ -5,6 +5,7 @@ Summary:        Network scanner for Internet-wide network studies
 License:        ASL 2.0
 URL:            https://zmap.io
 Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz
+Patch0:         zmap-1.1.2-destdir-support.patch
 BuildRequires:  byacc
 BuildRequires:  cmake
 BuildRequires:  flex
@@ -33,6 +34,7 @@ scanning.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake -DWITH_JSON=ON -DWITH_REDIS=ON
@@ -51,7 +53,7 @@ make install DESTDIR=%{buildroot}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Fri Jan 24 2014 Christopher Meng <rpm at cicku.me> - 1.1.2-1
+* Mon Jan 27 2014 Christopher Meng <rpm at cicku.me> - 1.1.2-1
 - Update to 1.1.2
 
 * Thu Dec 19 2013 Christopher Meng <rpm at cicku.me> - 1.1.1-1


More information about the scm-commits mailing list