X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libarchive.spec;h=3c488a1e223c27e124ce9ab39d1cefc12dfed1a0;hb=684eed2eb7415f5d8ffed7852193cecadc533f05;hp=c575b765b5d582dc9e2878064e9d14209bd49408;hpb=34f03146f71483ded85eacad581983e534e144d5;p=packages%2Flibarchive.git

diff --git a/libarchive.spec b/libarchive.spec
index c575b76..3c488a1 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,40 +1,47 @@
 #
 # Conditional build:
 %bcond_without	static_libs # don't build static libraries
-#
-Summary:	Library to create and read several different archive formats
-Summary(pl.UTF-8):	Biblioteka do tworzenia i odczytu różnych formatów archiwów
+
+Summary:	Multi-format archive and compression library
+Summary(pl.UTF-8):	Biblioteka do archiwizacji i kompresji w wielu formatach
 Name:		libarchive
-Version:	1.3.1
-Release:	1
+Version:	3.1.2
+Release:	3
 License:	BSD
 Group:		Libraries
-Source0:	http://people.freebsd.org/~kientzle/libarchive/src/%{name}-%{version}.tar.gz
-# Source0-md5:	c618d26d680ace57fcd5f59cea3151c6
-Patch0:		%{name}-CVE-2006-5680.patch
-Patch1:		%{name}-man_progname.patch
-URL:		http://people.freebsd.org/~kientzle/libarchive/
+Source0:	http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	efad5a503f66329bb9d2f4308b5de98a
+Patch0:		%{name}-man_progname.patch
+URL:		http://www.libarchive.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
-BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	bzip2-devel
 # for <ext2fs/ext2_fs.h>
 BuildRequires:	e2fsprogs-devel
-BuildRequires:	libtool
+BuildRequires:	libxml2-devel
+BuildRequires:	lzo-devel >= 2
+BuildRequires:	nettle-devel
+BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Libarchive is a programming library that can create and read several
 different streaming archive formats, including most popular TAR
-variants and several CPIO formats. It can also write SHAR archives.
+variants, several CPIO formats, and both BSD and GNU ar variants. It
+can also write SHAR archives and read ISO9660 CDROM images and ZIP
+archives.
+
+See README for complete format support.
 
 %description -l pl.UTF-8
-Libarchive jest biblioteką służacą to tworzenia i odczytu wielu
-różnych strumieniowych formatów archiwów, włączając w to popularne
-odmiany TAR oraz wiele formatów CPIO. Biblioteka ta potrafi także
-zapisywać archiwa SHAR.
+Libarchive to biblioteka potrafiąca tworzyć i odczytywać kilka różnych
+formatów archiwów strumieniowych, w tym najbardziej popularne warianty
+archiwów TAR, kilka formatów CPIO oraz warianty BSD oraz GNU archiwów
+ar. Potrafi także zapisywać archiwa SHAR oraz odczytywać obrazy CDROM
+ISO9660 i archiwa ZIP.
+
+Pełny wykaz obsługiwanych formatów znajduje się w pliku README.
 
 %package devel
 Summary:	Header files for libarchive library
@@ -44,6 +51,9 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	acl-devel
 Requires:	attr-devel
 Requires:	bzip2-devel
+Requires:	libxml2-devel
+Requires:	nettle-devel
+Requires:	xz-devel
 Requires:	zlib-devel
 
 %description devel
@@ -64,6 +74,18 @@ Static libarchive library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libarchive.
 
+%package -n bsdcpio
+Summary:	bsdcpio - cpio(1) implementation based on libarchive
+Summary(pl.UTF-8):	bsdcpio - implementacja programu cpio(1) oparta na libarchive
+Group:		Applications/Archiving
+Requires:	%{name} = %{version}-%{release}
+
+%description -n bsdcpio
+bsdcpio - cpio(1) implementation based on libarchive.
+
+%description -n bsdcpio -l pl.UTF-8
+bsdcpio - implementacja programu cpio(1), oparta na libarchive.
+
 %package -n bsdtar
 Summary:	bsdtar - tar(1) implementation based on libarchive
 Summary(pl.UTF-8):	bsdtar - implementacja programu tar(1) oparta na libarchive
@@ -79,17 +101,14 @@ bsdtar - implementacja programu tar(1), oparta na libarchive.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
-%{__make}
+	--disable-silent-rules \
+	--enable-bsdcpio=shared \
+	--enable-bsdtar=shared \
+	--enable-static%{!?with_static_libs:=no}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,15 +123,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README NEWS COPYING
 %attr(755,root,root) %{_libdir}/libarchive.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarchive.so.13
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libarchive.so
 %{_libdir}/libarchive.la
-%{_includedir}/*.h
-%{_mandir}/man3/*
-%{_mandir}/man5/*
+%{_includedir}/archive*.h
+%{_mandir}/man3/archive_*.3*
+%{_mandir}/man3/libarchive.3*
+%{_mandir}/man3/libarchive_changes.3*
+%{_mandir}/man3/libarchive_internals.3*
+%{_mandir}/man5/libarchive-formats.5*
+%{_mandir}/man5/cpio.5*
+%{_mandir}/man5/mtree.5*
+%{_mandir}/man5/tar.5*
+%{_pkgconfigdir}/libarchive.pc
 
 %if %{with static_libs}
 %files static
@@ -120,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libarchive.a
 %endif
 
+%files -n bsdcpio
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bsdcpio
+%{_mandir}/man1/bsdcpio.1*
+
 %files -n bsdtar
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bsdtar