SPECS: libarchive.spec - up to 1.2.37 - removed -shared.patch (no ...

[twittner]

Author: twittner                     Date: Thu Dec 15 18:26:41 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.2.37
- removed -shared.patch (no longer needed)

---- Files affected:
SPECS:
   libarchive.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/libarchive.spec
diff -u SPECS/libarchive.spec:1.3 SPECS/libarchive.spec:1.4
--- SPECS/libarchive.spec:1.3	Wed Oct  5 19:00:12 2005
+++ SPECS/libarchive.spec	Thu Dec 15 19:26:36 2005
@@ -1,14 +1,17 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	static_libs # don't build static libraries
+#
 Summary:	Library to create and read several different archive formats
 Summary(pl):	Biblioteka do tworzenia i odczytu różnych formatów archiwów
 Name:		libarchive
-Version:	1.02.034
+Version:	1.2.37
 Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://people.freebsd.org/~kientzle/libarchive/src/%{name}-%{version}.tar.gz
-# Source0-md5:	f4516a396d04eeae65a144150e3b17cc
-Patch0:		%{name}-shared.patch
+# Source0-md5:	c805505a06b5af5976a12c02351a76b9
 URL:		http://people.freebsd.org/~kientzle/libarchive/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -54,7 +57,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 %{__libtoolize}
@@ -62,18 +64,15 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-%{__make} \
-	LDFLAGS="%{rpmldflags} -lz -lbz2"
+%configure \
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libarchive.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libarchive.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,9 +91,11 @@
 %{_mandir}/man3/*
 %{_mandir}/man5/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libarchive.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/12/15 18:26:36  twittner
+- up to 1.2.37
+- removed -shared.patch (no longer needed)
+
 Revision 1.3  2005/10/05 17:00:12  arekm
 - up to 1.02.034
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libarchive.spec?r1=1.3&r2=1.4&f=u