remi pushed to ssdeep (el6). "v 2.13 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 5 07:25:15 UTC 2015


>From 6152f1f3b71b5c8d3c659ccf89b624db869c0f0a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 5 May 2015 09:12:25 +0200
Subject: v 2.13

(cherry picked from commit 33ae6c46b44f9fb4e7bf165a6bc6f7ef878bc62a)

diff --git a/.gitignore b/.gitignore
index 4b6913c..abbd792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ssdeep-2.11.tar.gz
 /ssdeep-2.11.1.tar.gz
 /ssdeep-2.12.tar.gz
+/ssdeep-2.13.tar.gz
diff --git a/sources b/sources
index c5d75a2..401015e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4825baaa554b1ffb8c109f56ad8d59fd  ssdeep-2.12.tar.gz
+7608b794ce6b25fae8bb1c2f4d35b2ad  ssdeep-2.13.tar.gz
diff --git a/ssdeep-2.10-build.patch b/ssdeep-2.10-build.patch
deleted file mode 100644
index 6c2aaee..0000000
--- a/ssdeep-2.10-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up ssdeep-2.10/configure.ac.old ssdeep-2.10/configure.ac
---- ssdeep-2.10/configure.ac.old	2014-01-22 11:39:10.000000000 +0100
-+++ ssdeep-2.10/configure.ac	2014-01-22 11:40:35.000000000 +0100
-@@ -21,16 +21,6 @@ case $host in
- esac
- 
- 
--# Bring additional directories where things might be found into our
--# search path. I don't know why autoconf doesn't do this by default
--for spfx in /usr/local /opt/local /sw ; do
--    echo checking ${spfx}/include
--    if test -d ${spfx}/include; then
--        CPPFLAGS="-I${spfx}/include $CPPFLAGS"
--        LDFLAGS="-L${spfx}/lib $LDFLAGS"
--    fi
--done
--
- AC_C_BIGENDIAN
- AC_SYS_LARGEFILE
- 
-diff -up ssdeep-2.10/configure.old ssdeep-2.10/configure
---- ssdeep-2.10/configure.old	2014-01-22 11:39:00.000000000 +0100
-+++ ssdeep-2.10/configure	2014-01-22 11:40:21.000000000 +0100
-@@ -15462,16 +15462,6 @@ $as_echo "#define __LINUX__ 1" >>confdef
- esac
- 
- 
--# Bring additional directories where things might be found into our
--# search path. I don't know why autoconf doesn't do this by default
--for spfx in /usr/local /opt/local /sw ; do
--    echo checking ${spfx}/include
--    if test -d ${spfx}/include; then
--        CPPFLAGS="-I${spfx}/include $CPPFLAGS"
--        LDFLAGS="-L${spfx}/lib $LDFLAGS"
--    fi
--done
--
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
- if ${ac_cv_c_bigendian+:} false; then :
diff --git a/ssdeep.spec b/ssdeep.spec
index 88cfc9b..0a14baf 100644
--- a/ssdeep.spec
+++ b/ssdeep.spec
@@ -8,7 +8,7 @@
 #
 
 Name:      ssdeep
-Version:   2.12
+Version:   2.13
 Release:   1%{?dist}
 Summary:   Compute context triggered piecewise hashes
 Group:     Development/Tools
@@ -17,9 +17,6 @@ License:   GPLv2+
 URL:       http://ssdeep.sourceforge.net/
 Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Drop /usr/local and /opt from build path
-Patch0:    %{name}-2.10-build.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
@@ -54,14 +51,14 @@ that use libfuzzy.
 %prep
 %setup -q
 
-%patch0 -p1 -b .old
-
 # avoid autotools being re-run
 touch -r aclocal.m4 configure configure.ac
 
 
 %build
-%configure --disable-static
+%configure \
+   --disable-auto-search \
+   --disable-static
 
 # rpath removal
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -106,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May  5 2015 Remi Collet <remi at fedoraproject.org> - 2.13-1
+- update to 2.13
+
 * Sun Oct 26 2014 Remi Collet <remi at fedoraproject.org> - 2.12-1
 - update to 2.12
 - fix license handling
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ssdeep.git/commit/?h=el6&id=6152f1f3b71b5c8d3c659ccf89b624db869c0f0a


More information about the scm-commits mailing list