rpms/afflib/devel afflib-3.0.1-WCtype.patch, NONE, 1.1 afflib-3.1.3-gcc43.patch, NONE, 1.1 afflib-3.1.3-ldconfig.patch, NONE, 1.1 afflib-3.1.3-pkgconfig.patch, NONE, 1.1 afflib.pc.in, NONE, 1.1 afflib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Chauvet (kwizart) fedora-extras-commits at redhat.com
Fri Mar 21 00:03:45 UTC 2008 

Author: kwizart

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

Modified Files:
	.cvsignore sources 
Added Files:
	afflib-3.0.1-WCtype.patch afflib-3.1.3-gcc43.patch 
	afflib-3.1.3-ldconfig.patch afflib-3.1.3-pkgconfig.patch 
	afflib.pc.in afflib.spec 
Log Message:
Initial import


afflib-3.0.1-WCtype.patch:

--- NEW FILE afflib-3.0.1-WCtype.patch ---
diff -up afflib-3.0.4/configure.ac.WCtype afflib-3.0.4/configure.ac
--- afflib-3.0.4/configure.ac.WCtype	2007-12-28 15:23:53.000000000 +0100
+++ afflib-3.0.4/configure.ac	2007-12-28 15:25:59.000000000 +0100
@@ -115,6 +115,18 @@ AC_CHECK_FUNCS([ftruncate memset mkdir p
 # Special features that can be enabled or disabled
 AC_ARG_ENABLE([noopt], AC_HELP_STRING([--enable-noopt],[Drop -O C flags]))
 
+AS_IF([test "x$ac_afflib_enable_wide_character_type" != xno ],
+	[AC_DEFINE([HAVE_WIDE_CHARACTER_TYPE],[1],[Defines if wide character type should be used])
+		AC_CHECK_FUNCS([btowc fgetws mbsinit mbsrtowcs swprintf wmain wmemchr wmemcmp wmemcpy wmemrchr wctob wcschr wcscmp wcscpy wcsdup wcslen wcsncmp wcsncpy wcsrchr wcsrtombs wcstol wcstoul])
+		AC_CHECK_HEADERS([wchar.h],
+			[AC_DEFINE([HAVE_WCHAR_H],[1],[Define to 1 if you have the <wchar.h> header file.])
+			AC_SUBST([HAVE_WCHAR_H],[1])],
+			[AC_SUBST([HAVE_WCHAR_H],[0])])
+
+		AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[1])],
+	[AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[0])
+	AC_SUBST([HAVE_WCHAR_H],[0])])
+
 ################################################################
 ## LIBEWF support
 AC_ARG_ENABLE([libewf],

afflib-3.1.3-gcc43.patch:

--- NEW FILE afflib-3.1.3-gcc43.patch ---
diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h
--- afflib-3.1.3/lib/s3_glue.h.gcc43	2008-03-12 18:58:28.000000000 +0100
+++ afflib-3.1.3/lib/s3_glue.h	2008-03-12 18:59:25.000000000 +0100
@@ -17,6 +17,8 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cstring>                          // memcpy, strcmp, strlen
+#include <algorithm>                        // sort
 
 #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET"
 #define S3_DEBUG   "S3_DEBUG"

afflib-3.1.3-ldconfig.patch:

--- NEW FILE afflib-3.1.3-ldconfig.patch ---
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 =  \

afflib-3.1.3-pkgconfig.patch:

--- NEW FILE afflib-3.1.3-pkgconfig.patch ---
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
+)
 


--- NEW FILE afflib.pc.in ---
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}


--- NEW FILE afflib.spec ---
Name:           afflib
Version:        3.1.3
Release:        3%{?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)

BuildRequires:  libtool

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:  lzma-devel
BuildRequires:  ncurses-devel
BuildRequires:  libtermcap-devel
BuildRequires:  openssl-devel
# GPLv2 FOSS incompatible with BSD with advertising
##BuildRequires:  readline-devel
#BuildRequires:  libedit-devel - good replacement for readline - not supported for now
BuildRequires:  zlib-devel


%description
AFF® is an open and extensible file format designed to store disk images and
associated metadata.
afflib is library for support of the Advanced Forensic Format (AFF).


%package -n     afftools
Summary:        Utilities for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       ewftools

%description -n afftools
The %{name}-utils package contains utilities for using %{name}.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       openssl-devel
Requires:       pkg-config

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%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

#fix spurious permissions with lzma443
find lzma443 -type f -exec chmod 0644 {} ';'
chmod 0644 lib/base64.cpp

# install pkg-config
install -pm 0644 %{SOURCE1} .
aclocal
autoheader
autoconf
automake


%build
%configure --enable-shared \
  --enable-wide-character-type \
  --disable-static \
  --enable-s3=yes \
  --enable-libewf=yes

# Remove rpath from libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'



%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS BUGLIST.txt ChangeLog COPYING NEWS README
%doc doc/announce_2.2.txt 
%{_libdir}/*.so.*

%files -n afftools
%defattr(-,root,root,-)
%{_bindir}/af*
%{_bindir}/s3

%files devel
%defattr(-,root,root,-)
%doc doc/crypto_design.txt doc/crypto_doc.txt
%{_includedir}/afflib/
%{_libdir}/*.so
%{_libdir}/pkgconfig/afflib.pc


%changelog
* Wed Mar 19 2008 kwizart < kwizart at gmail.com > - 3.1.3-3
- Add missing requires with pkgconfig

* Mon Mar 17 2008 kwizart < kwizart at gmail.com > - 3.1.3-2
- Rebuild with newer libewf and enable-libewf=yes
- Add pkg-config support in afflib-devel.
- Add a patch to remove ldconfig call when building the package.
- Add libtermcap-devel

* Wed Mar 12 2008 kwizart < kwizart at gmail.com > - 3.1.3-1
- Update to 3.1.3
- Disable libewf support in afflib for now.
- Disable rpath
- Fix for gcc43 and s3

* Fri Nov 30 2007 kwizart < kwizart at gmail.com > - 3.0.4-1
- Update to 3.0.4

* Sun Nov 18 2007 kwizart < kwizart at gmail.com > - 3.0.1-1
- Update to 3.0.1

* Fri Nov  2 2007 kwizart < kwizart at gmail.com > - 2.4.0-1
- Initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Mar 2008 22:59:37 -0000	1.1
+++ .cvsignore	21 Mar 2008 00:03:08 -0000	1.2
@@ -0,0 +1 @@
+afflib-3.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Mar 2008 22:59:37 -0000	1.1
+++ sources	21 Mar 2008 00:03:08 -0000	1.2
@@ -0,0 +1 @@
+606a80d5b4d9d052c2f34b9947677634  afflib-3.1.3.tar.gz

More information about the fedora-extras-commits mailing list