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

diff --git a/libarchive.spec b/libarchive.spec
index e1bb945..3c488a1 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,29 +1,26 @@
 #
 # 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:	2.8.4
-Release:	2
+Version:	3.1.2
+Release:	3
 License:	BSD
 Group:		Libraries
-Source0:	http://libarchive.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	83b237a542f27969a8d68ac217dc3796
+Source0:	http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	efad5a503f66329bb9d2f4308b5de98a
 Patch0:		%{name}-man_progname.patch
-URL:		http://people.freebsd.org/~kientzle/libarchive/
+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:	libmd5-devel
-#BuildRequires:	libtool
 BuildRequires:	libxml2-devel
-BuildRequires:	openssl-devel
+BuildRequires:	lzo-devel >= 2
+BuildRequires:	nettle-devel
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,13 +28,20 @@ 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
@@ -48,7 +52,7 @@ Requires:	acl-devel
 Requires:	attr-devel
 Requires:	bzip2-devel
 Requires:	libxml2-devel
-Requires:	openssl-devel
+Requires:	nettle-devel
 Requires:	xz-devel
 Requires:	zlib-devel
 
@@ -99,13 +103,11 @@ bsdtar - implementacja programu tar(1), oparta na libarchive.
 %patch0 -p1
 
 %build
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__autoconf}
-#%%{__autoheader}
-#%%{__automake}
 %configure \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
+	--disable-silent-rules \
+	--enable-bsdcpio=shared \
+	--enable-bsdtar=shared \
+	--enable-static%{!?with_static_libs:=no}
 %{__make} -j1
 
 %install
@@ -121,16 +123,23 @@ 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.2
+%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/*.3*
-%{_mandir}/man5/*.5*
+%{_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}