rpms/afflib/devel afflib-3.4.1-gcc43.patch, NONE, 1.1 afflib-3.4.1-pyver.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.14, 1.15 afflib.spec, 1.31, 1.32 sources, 1.14, 1.15

Thu Sep 24 20:54:36 UTC 2009

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2497/devel

Modified Files:
	.cvsignore afflib.spec sources 
Added Files:
	afflib-3.4.1-gcc43.patch afflib-3.4.1-pyver.patch import.log 
Log Message:
- Update to 3.4.1
- Update gcc43 (new case)
- Enable python binding.
- Avoid version-info on the python module.


afflib-3.4.1-gcc43.patch:
 hashextent.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE afflib-3.4.1-gcc43.patch ---
diff -up afflib-3.4.1/tools/hashextent.h.gcc43 afflib-3.4.1/tools/hashextent.h
--- afflib-3.4.1/tools/hashextent.h.gcc43	2009-09-21 21:52:51.000000000 +0200
+++ afflib-3.4.1/tools/hashextent.h	2009-09-24 22:39:22.534808641 +0200
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <map>
 #include <set>
+#include <algorithm>
 
 
 using std::string;

afflib-3.4.1-pyver.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afflib-3.4.1-pyver.patch ---
diff -up afflib-3.4.1/pyaff/Makefile.am.pyver afflib-3.4.1/pyaff/Makefile.am
--- afflib-3.4.1/pyaff/Makefile.am.pyver	2009-09-24 22:42:06.534805852 +0200
+++ afflib-3.4.1/pyaff/Makefile.am	2009-09-24 22:45:13.306557135 +0200
@@ -9,5 +9,5 @@ pyexec_LTLIBRARIES 	= pyaff.la
 pyaff_la_SOURCES	= pyaff.c
 pyaff_la_LIBADD		= ../lib/libafflib.la
 pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
-pyaff_la_LDFLAGS 	= -module $(PYTHON_LDFLAGS)
+pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
 endif
diff -up afflib-3.4.1/pyaff/Makefile.in.pyver afflib-3.4.1/pyaff/Makefile.in
--- afflib-3.4.1/pyaff/Makefile.in.pyver	2009-09-24 08:08:53.000000000 +0200
+++ afflib-3.4.1/pyaff/Makefile.in	2009-09-24 22:45:15.322807098 +0200
@@ -226,7 +226,7 @@ EXTRA_DIST = PKG-INFO README pyaff.c set
 @HAVE_PYTHON_TRUE at pyaff_la_SOURCES = pyaff.c
 @HAVE_PYTHON_TRUE at pyaff_la_LIBADD = ../lib/libafflib.la
 @HAVE_PYTHON_TRUE at pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
- at HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
+ at HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
 all: all-am
 
 .SUFFIXES:


--- NEW FILE import.log ---
afflib-3_4_1-1_fc11:HEAD:afflib-3.4.1-1.fc11.src.rpm:1253825572


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Sep 2009 08:34:39 -0000	1.14
+++ .cvsignore	24 Sep 2009 20:54:35 -0000	1.15
@@ -1 +1 @@
-afflib-3.3.7.tar.gz
+afflib-3.4.1.tar.gz


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- afflib.spec	2 Sep 2009 08:34:39 -0000	1.31
+++ afflib.spec	24 Sep 2009 20:54:35 -0000	1.32
@@ -1,5 +1,7 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           afflib
-Version:        3.3.7
+Version:        3.4.1
 Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
@@ -7,7 +9,8 @@ Group:          System Environment/Libra
 License:        BSD with advertising
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
-Patch0:         afflib-3.3.4-gcc44.patch
+Patch0:         afflib-3.4.1-gcc43.patch
+Patch1:         afflib-3.4.1-pyver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -57,7 +60,8 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .pyver
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
 
@@ -70,6 +74,7 @@ chmod 0644 lib/base64.{h,cpp}
 %configure --enable-shared \
   --disable-static \
   --enable-libewf=yes \
+  --enable-python=yes \
   --enable-qemu=no
 
 # Remove rpath from libtool
@@ -107,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n afftools
 %defattr(-,root,root,-)
 %{_bindir}/af*
+%{python_sitearch}/pyaff.so
 %{_mandir}/man1/afcat.1.*
 
 %files devel
@@ -118,8 +124,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.3.7-1
+* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 3.4.1-1
+- Update to 3.4.1
+- Update gcc43 (new case)
+- Enable python binding.
+- Avoid version-info on the python module.
+
+* Wed Sep  2 2009 kwizart < kwizart at gmail.com > - 3.3.7-2
 - Update to 3.3.7
+- Update gcc44 patch
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-4
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Sep 2009 08:34:39 -0000	1.14
+++ sources	24 Sep 2009 20:54:35 -0000	1.15
@@ -1 +1 @@
-198433e717073d69976ee0b3b9399ab4  afflib-3.3.7.tar.gz
+eb3a44f893cd268f32c91b8eb673ecc7  afflib-3.4.1.tar.gz


