rpms/afflib/devel afflib-3.2.3-nos3.patch, NONE, 1.1 afflib.spec, 1.10, 1.11 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 afflib-3.1.3-ldconfig.patch, 1.1, NONE afflib-3.2.1-fix_namespace.patch, 1.1, NONE

[Chauvet Nicolas (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11255

Modified Files:
	afflib.spec sources .cvsignore 
Added Files:
	afflib-3.2.3-nos3.patch 
Removed Files:
	afflib-3.1.3-ldconfig.patch afflib-3.2.1-fix_namespace.patch 
Log Message:
- Update to 3.2.3


afflib-3.2.3-nos3.patch:

--- NEW FILE afflib-3.2.3-nos3.patch ---
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"])
 
 
 ##


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- afflib.spec	26 Jun 2008 18:46:06 -0000	1.10
+++ afflib.spec	4 Jul 2008 23:00:13 -0000	1.11
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jun 2008 12:02:06 -0000	1.5
+++ sources	4 Jul 2008 23:00:13 -0000	1.6
@@ -1 +1 @@
-ac43df78c10b48d713f7eb169fa6633d  afflib-3.2.1.tar.gz
+cb3b5a181adeee5047ded626e5903859  afflib-3.2.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jun 2008 12:02:06 -0000	1.5
+++ .cvsignore	4 Jul 2008 23:00:13 -0000	1.6
@@ -1 +1 @@
-afflib-3.2.1.tar.gz
+afflib-3.2.3.tar.gz


--- afflib-3.1.3-ldconfig.patch DELETED ---


--- afflib-3.2.1-fix_namespace.patch DELETED ---