From 6988b0f440c8ab0cc6802349de9ab7006bcd6336 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@fedoraproject.org>
Date: Jul 04 2008 23:00:13 +0000
Subject: - Update to 3.2.3


---

diff --git a/.cvsignore b/.cvsignore
index 7d68c2e..785a27b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-afflib-3.2.1.tar.gz
+afflib-3.2.3.tar.gz
diff --git a/afflib-3.1.3-ldconfig.patch b/afflib-3.1.3-ldconfig.patch
deleted file mode 100644
index dae49d2..0000000
--- a/afflib-3.1.3-ldconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up afflib-3.1.3/lib/Makefile.am.ldconfig afflib-3.1.3/lib/Makefile.am
---- afflib-3.1.3/lib/Makefile.am.ldconfig	2008-03-18 02:37:29.000000000 +0100
-+++ afflib-3.1.3/lib/Makefile.am	2008-03-18 02:37:56.000000000 +0100
-@@ -10,20 +10,6 @@ s3_LDADD = libafflib.la  
- 
- TESTS = aftest
- 
--install-exec-hook:
--	@if [ -r /etc/ld.so.conf ] ; then \
--	  echo "*************************************************" ;\
--	  echo "*** Checking shared library config for $(libdir) " ;\
--	  if grep ^$(libdir) /etc/ld.so.conf >/dev/null ; \
--             then echo $(libdir) already installed ; \
--             else echo installing $(libdir) in /etc/ld.so.conf ; \
--                  echo $(libdir) >> /etc/ld.so.conf ; \
--		  PATH=$(PATH):/sbin; \
--		  ldconfig; \
--          fi ; \
--	  echo "*************************************************" ;\
--	fi
--
- EXTRA_DIST = 
- 
- INCLUDES =  \
diff --git a/afflib-3.2.1-fix_namespace.patch b/afflib-3.2.1-fix_namespace.patch
deleted file mode 100644
index 9af1354..0000000
--- a/afflib-3.2.1-fix_namespace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up afflib-3.2.1/lib/afflib_i.h.fix_namespace afflib-3.2.1/lib/afflib_i.h
---- afflib-3.2.1/lib/afflib_i.h.fix_namespace	2008-06-25 11:01:34.000000000 +0200
-+++ afflib-3.2.1/lib/afflib_i.h	2008-06-25 11:01:51.000000000 +0200
-@@ -340,7 +340,7 @@ typedef struct _AFFILE {
-     void	*vnodeprivate;	      // private storage for the vnode
-     void	(*error_reporter)(const char *fmt, ...);
-     struct af_crypto *crypto;		
--} AFFILE;
-+};
- 
- 
- 
diff --git a/afflib-3.2.3-nos3.patch b/afflib-3.2.3-nos3.patch
new file mode 100644
index 0000000..8b16755
--- /dev/null
+++ b/afflib-3.2.3-nos3.patch
@@ -0,0 +1,32 @@
+diff -up afflib-3.2.3/lib/Makefile.am.nos3 afflib-3.2.3/lib/Makefile.am
+--- afflib-3.2.3/lib/Makefile.am.nos3	2008-06-28 10:00:34.000000000 +0200
++++ afflib-3.2.3/lib/Makefile.am	2008-07-05 00:48:43.000000000 +0200
+@@ -1,13 +1,16 @@
+-bin_PROGRAMS = aftest s3 
++bin_PROGRAMS = aftest
+ 
+ aftest_SOURCES = aftest.cpp
+ aftest_LDADD = libafflib.la  
+ #aftest_LDFLAGS = -static
+ aftest_LDFLAGS = $(PTHREAD_CFLAGS)
+ 
++if MAYBE_S3
++bin_PROGRAMS += s3
+ s3_SOURCES = s3.cpp
+ s3_LDADD = libafflib.la  
+ #s3_LDFLAGS = -static
++endif
+ 
+ TESTS = aftest
+ 
+diff -up afflib-3.2.3/configure.ac.nos3 afflib-3.2.3/configure.ac
+--- afflib-3.2.3/configure.ac.nos3	2008-07-05 00:38:23.000000000 +0200
++++ afflib-3.2.3/configure.ac	2008-07-05 00:48:31.000000000 +0200
+@@ -256,6 +256,7 @@ if test "x${enable_s3}" = "xyes" ; then
+   S3_BIN='s3$(EXEEXT)'
+ fi
+ AC_SUBST(S3_BIN)
++AM_CONDITIONAL([MAYBE_S3], [test "x${enable_s3}" = "xyes"])
+ 
+ 
+ ##
diff --git a/afflib.spec b/afflib.spec
index b0c4979..9497d34 100644
--- a/afflib.spec
+++ b/afflib.spec
@@ -1,6 +1,6 @@
 Name:           afflib
-Version:        3.2.1
-Release:        4%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -9,8 +9,7 @@ URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
 Patch0:         afflib-3.0.1-WCtype.patch
 Patch1:         afflib-3.1.3-gcc43.patch
-Patch3:         afflib-3.1.3-ldconfig.patch
-Patch4:         afflib-3.2.1-fix_namespace.patch
+Patch2:         afflib-3.2.3-nos3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -62,8 +61,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .WCtype
 %patch1 -p1 -b .gcc43
-%patch3 -p1 -b .ldconfig
-%patch4 -p1 -b .fix_namespace
+%patch2 -p1 -b .nos3
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
 
@@ -79,7 +77,7 @@ autoreconf
 %configure --enable-shared \
   --enable-wide-character-type \
   --disable-static \
-  --enable-s3=no \
+  --disable-s3 \
   --enable-libewf=yes
 
 # Remove rpath from libtool
@@ -127,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul  4 2008 kwizart < kwizart at gmail.com > - 3.2.3-1
+- Update to 3.2.3
+
 * Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.2.1-4
 - Explicitely disable s3
 
diff --git a/sources b/sources
index 40bea98..c4fad64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac43df78c10b48d713f7eb169fa6633d  afflib-3.2.1.tar.gz
+cb3b5a181adeee5047ded626e5903859  afflib-3.2.3.tar.gz