packages: openconnect/openconnect.spec - BR: zlib-devel (for completeness) ...

[qboosh]

Author: qboosh                       Date: Sun Sep 25 12:46:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: zlib-devel (for completeness)
- added -static (on static_libs bcond)

---- Files affected:
packages/openconnect:
   openconnect.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/openconnect/openconnect.spec
diff -u packages/openconnect/openconnect.spec:1.6 packages/openconnect/openconnect.spec:1.7
--- packages/openconnect/openconnect.spec:1.6	Mon Sep 19 11:00:51 2011
+++ packages/openconnect/openconnect.spec	Sun Sep 25 14:46:35 2011
@@ -1,20 +1,25 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	static_libs	# static library
+#
 Summary:	Client for Cisco's AnyConnect SSL VPN
 Summary(pl.UTF-8):	Klient Cisco AnyConnect SSL VPN
 Name:		openconnect
 Version:	3.12
 Release:	1
-License:	LGPL v2
-Group:		Applications
+License:	LGPL v2.1
+Group:		Applications/Networking
 Source0:	ftp://ftp.infradead.org/pub/openconnect/%{name}-%{version}.tar.gz
 # Source0-md5:	2f4fceb3f921ca8deb3a7cbd19a5e008
 URL:		http://www.infradead.org/openconnect.html
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	libproxy-devel
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,20 +29,32 @@
 OpenConnect jest klientem Cisco AnyConnect SSL VPN.
 
 %package devel
-Summary:	Development files for OpenConnect
-Summary(pl.UTF-8):	Pliki programistyczne dla OpenConnect
+Summary:	Development files for OpenConnect library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki OpenConnect
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libproxy-devel
-Requires:	libxml2-devel
+Requires:	libxml2-devel >= 2.0
 Requires:	openssl-devel
 Requires:	zlib-devel
 
 %description devel
-Development files for OpenConnect.
+Development files for OpenConnect library.
 
 %description devel -l pl.UTF-8
-Pliki programistyczne dla OpenConnect.
+Pliki programistyczne biblioteki OpenConnect.
+
+%package static
+Summary:	Static OpenConnect library
+Summary(pl.UTF-8):	Statyczna biblioteka OpenConnect
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static OpenConnect library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka OpenConnect.
 
 %prep
 %setup -q
@@ -47,19 +64,19 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
-%{__make} \
-	CC="%{__cc}" \
-	RPM_OPT_FLAGS="%{rpmcppflags} %{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
+%configure \
+	%{?with_static_libs:--enable-static}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	LIBDIR=%{_libdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,12 +97,22 @@
 %{_includedir}/openconnect.h
 %{_pkgconfigdir}/openconnect.pc
 
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libopenconnect.a
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/09/25 12:46:35  qboosh
+- BR: zlib-devel (for completeness)
+- added -static (on static_libs bcond)
+
 Revision 1.6  2011/09/19 09:00:51  arekm
 - up to 3.12
 
@@ -103,4 +130,3 @@
 
 Revision 1.1  2009/11/28 18:16:55  megabajt
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openconnect/openconnect.spec?r1=1.6&r2=1.7&f=u