packages: neon/neon.spec - explicit (but optional) pakchois-devel dependenc...

[jajcus]

Author: jajcus                       Date: Wed Dec 14 13:10:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- explicit (but optional) pakchois-devel dependency
- *.la file dropped (*.pc and neon-config are there)
- Release: 3

---- Files affected:
packages/neon:
   neon.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: packages/neon/neon.spec
diff -u packages/neon/neon.spec:1.102 packages/neon/neon.spec:1.103
--- packages/neon/neon.spec:1.102	Wed Aug  3 01:19:56 2011
+++ packages/neon/neon.spec	Wed Dec 14 14:10:20 2011
@@ -5,12 +5,13 @@
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	kerberos5	# don't build Kerberos V support
 %bcond_without	libproxy	# don't build libproxy support
+%bcond_without	pakchois	# don't build pakchois-based PKCS#11 support
 
 Summary:	An HTTP and WebDAV client library
 Summary(pl.UTF-8):	Biblioteka kliencka HTTP i WebDAV
 Name:		neon
 Version:	0.29.6
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://www.webdav.org/neon/%{name}-%{version}.tar.gz
@@ -23,6 +24,7 @@
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_pakchois:BuildRequires:	pakchois-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,6 +72,7 @@
 Requires:	%{name} = %{version}-%{release}
 %{?with_kerberos5:Requires:	heimdal-devel}
 %{?with_libproxy:Requires:	libproxy-devel}
+%{?with_pakchois:Requires:	pakchois-devel}
 Requires:	libxml2-devel
 Requires:	openssl-devel >= 0.9.7c
 
@@ -113,6 +116,7 @@
 	--with-ssl \
 	--enable-threadsafe-ssl=posix \
 	--enable-shared \
+	--with%{!?with_pakchois:out}-pakchois \
 	%{!?with_static_libs:--disable-static} \
 	%{!?with_kerberos5:--without-gssapi} \
 	%{!?with_libproxy:--without-libproxy} \
@@ -126,6 +130,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}
 
 %clean
@@ -145,7 +151,6 @@
 %doc doc/*.txt
 %attr(755,root,root) %{_bindir}/neon-config
 %attr(755,root,root) %{_libdir}/libneon.so
-%{_libdir}/libneon.la
 %{_includedir}/neon
 %{_pkgconfigdir}/neon.pc
 %{_mandir}/man1/neon-config.1*
@@ -170,6 +175,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2011/12/14 13:10:20  jajcus
+- explicit (but optional) pakchois-devel dependency
+- *.la file dropped (*.pc and neon-config are there)
+- Release: 3
+
 Revision 1.102  2011/08/02 23:19:56  baggins
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/neon/neon.spec?r1=1.102&r2=1.103&f=u