diff --git a/afflib-3.1.3-pkgconfig.patch b/afflib-3.1.3-pkgconfig.patch deleted file mode 100644 index edb79c1..0000000 --- a/afflib-3.1.3-pkgconfig.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up afflib-3.1.3/Makefile.am.pkgconfig afflib-3.1.3/Makefile.am ---- afflib-3.1.3/Makefile.am.pkgconfig 2008-03-03 07:53:49.000000000 +0100 -+++ afflib-3.1.3/Makefile.am 2008-03-17 23:51:38.000000000 +0100 -@@ -1,5 +1,9 @@ - SUBDIRS = lib tools lzma443 win32 tests doc - -+pkgconfigdir = $(libdir)/pkgconfig -+ -+pkgconfig_DATA = afflib.pc -+ - include_HEADERS = - pkginclude_HEADERS = lib/afflib.h lib/afflib_i.h lib/afflib_sha256.h lib/aftimer.h lib/utils.h - -@@ -48,7 +52,8 @@ DOCS = BUGLIST.txt README_Linux.txt READ - - EXTRA_DIST = $(DOCS) \ - afflib.spec.in \ -- afflib.spec -+ afflib.spec \ -+ afflib.pc.in - misc/expat-2.0.1.tar.gz - - validate: tools/afcompare tests/encrypted.aff lib/aftest -diff -up afflib-3.1.3/configure.ac.pkgconfig afflib-3.1.3/configure.ac ---- afflib-3.1.3/configure.ac.pkgconfig 2008-03-17 23:53:05.000000000 +0100 -+++ afflib-3.1.3/configure.ac 2008-03-17 23:53:40.000000000 +0100 -@@ -239,5 +239,7 @@ AC_MSG_NOTICE([LIBS: ${LIBS}]) - AC_MSG_NOTICE([LDFLAGS: ${LDFLAGS}]) - AC_MSG_NOTICE([*****************************************]) - AC_MSG_NOTICE([]) --AC_OUTPUT -+AC_OUTPUT( -+afflib.pc -+) - diff --git a/afflib.pc.in b/afflib.pc.in deleted file mode 100644 index d8000fd..0000000 --- a/afflib.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/afflib - -Name: afflib -Description: Library to support the Advanced Forensic Format -Version: @VERSION@ -Libs: -L${libdir} -lafflib -lstdc++ -Cflags: -I${includedir} diff --git a/afflib.spec b/afflib.spec index a837c6b..57a6cc2 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,16 +1,14 @@ Name: afflib -Version: 3.1.3 -Release: 4%{?dist} +Version: 3.1.6 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Source1: afflib.pc.in Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch -Patch2: afflib-3.1.3-pkgconfig.patch Patch3: afflib-3.1.3-ldconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,8 +18,8 @@ BuildRequires: curl-devel BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel -#BuildRequires: libewf-devel >= 20080305 -# Afflib uses lzma-SDK 443 +BuildRequires: libewf-devel >= 20080305 +# Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel @@ -63,7 +61,6 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .WCtype %patch1 -p1 -b .gcc43 -%patch2 -p1 -b .pkgconfig %patch3 -p1 -b .ldconfig # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -72,12 +69,8 @@ developing applications that use %{name}. find lzma443 -type f -exec chmod 0644 {} ';' chmod 0644 lib/base64.cpp -# install pkg-config -install -pm 0644 %{SOURCE1} . -aclocal -autoheader -autoconf -automake +# Autoreconf +autoreconf %build @@ -133,13 +126,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 +- Update to 3.1.6 + * Fri Mar 21 2008 kwizart < kwizart at gmail.com > - 3.1.3-4 - Fix typo * Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 3.1.3-3 - Add missing requires with pkgconfig -- Fix typo -- Disable libewf support for F-8 * Mon Mar 17 2008 kwizart < kwizart at gmail.com > - 3.1.3-2 - Rebuild with newer libewf and enable-libewf=yes diff --git a/sources b/sources index bc26ab7..1779ad1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -606a80d5b4d9d052c2f34b9947677634 afflib-3.1.3.tar.gz +5e0250f9104ad64af0d0f9a5a41c65c7 afflib-3.1.6.tar.gz