diff --git a/openvas-scanner-gcrypt.patch b/openvas-scanner-gcrypt.patch deleted file mode 100644 index 64fb5ef..0000000 --- a/openvas-scanner-gcrypt.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru openvas-scanner-5.0.3/CMakeLists.txt openvas-scanner-5.0.3.new/CMakeLists.txt ---- openvas-scanner-5.0.3/CMakeLists.txt 2015-05-26 19:05:39.301421866 +0200 -+++ openvas-scanner-5.0.3.new/CMakeLists.txt 2015-05-29 03:36:21.769126834 +0200 -@@ -196,18 +196,18 @@ - pkg_check_modules (GLIB REQUIRED glib-2.0>=2.16) - - message (STATUS "Looking for libgcrypt...") --find_library (GCRYPT gcrypt) --if (NOT GCRYPT) -+find_library (LIBGCRYPT gcrypt) -+if (NOT LIBGCRYPT) - message (SEND_ERROR "The libgcrypt library is required.") --else (NOT GCRYPT) -- message (STATUS "Looking for libgcrypt... ${GCRYPT}") -- execute_process (COMMAND libgcrypt-config --libs -- OUTPUT_VARIABLE GCRYPT_LDFLAGS -- OUTPUT_STRIP_TRAILING_WHITESPACE) -+else (NOT LIBGCRYPT) -+ message (STATUS "Looking for libgcrypt... ${LIBGCRYPT}") - execute_process (COMMAND libgcrypt-config --cflags - OUTPUT_VARIABLE GCRYPT_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) --endif (NOT GCRYPT) -+ execute_process (COMMAND libgcrypt-config --libs -+ OUTPUT_VARIABLE GCRYPT_LDFLAGS -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif (NOT LIBGCRYPT) - - ## Version - diff --git a/openvas-scanner.spec b/openvas-scanner.spec index 8a68eba..d56e68f 100644 --- a/openvas-scanner.spec +++ b/openvas-scanner.spec @@ -4,7 +4,7 @@ Name: openvas-scanner Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Vulnerability Assessment (OpenVAS) Scanner License: GPLv2 @@ -38,9 +38,6 @@ Patch3: openvas-scanner-rulesdir.patch # Replace _BSD_SOURCE and _SVID_SOURCE with _DEFAULT_SOURCE otherwise build fails with Werror Patch4: openvas-scanner-bsdsource.patch -# Build on FC23 fails because not able to find the libgcrypt -Patch5: openvas-scanner-gcrypt.patch - BuildRequires: openvas-libraries-devel >= 7.0 BuildRequires: cmake >= 2.6.0 @@ -106,8 +103,6 @@ Scanner module for the Open Vulnerability Assessment System (OpenVAS). #%patch4 -p 1 -b .bsdsource #%endif -%patch5 -p 1 -b .gcrypt - for i in CHANGES ChangeLog; do iconv -f iso8859-1 -t utf-8 $i > $i.utf8 && \ touch -r $i $i.utf8 && \ @@ -245,6 +240,9 @@ fi #attr(644,root,root) _{_libdir}/openvas/plugins/*.nes %changelog +* Fri May 29 2015 Michal Ambroz - 5.0.3-2 +- fixing build error with gcrypt when RPM_OPT_FLAGS not used + * Tue May 26 2015 Michal Ambroz - 5.0.3-1 - Update to OpenVAS-8 openvas-scanner release 5.0.3