Author: qboosh Date: Sun Oct 10 18:59:45 2010 GMT Module: packages Tag: HEAD ---- Log message: - separated networkmanager plugin - added webkit bcond
---- Files affected: packages/libproxy: libproxy.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: packages/libproxy/libproxy.spec diff -u packages/libproxy/libproxy.spec:1.8 packages/libproxy/libproxy.spec:1.9 --- packages/libproxy/libproxy.spec:1.8 Sun Sep 19 13:55:59 2010 +++ packages/libproxy/libproxy.spec Sun Oct 10 20:59:40 2010 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without webkit # WebKit plugin +# Summary: Library for automatic proxy configuration management Summary(pl.UTF-8): Biblioteka do automatycznego zarządzania konfiguracją proxy Name: libproxy @@ -6,6 +10,7 @@ Release: 6 License: LGPL v2 Group: Libraries +#Source0Download: http://code.google.com/p/libproxy/downloads/list Source0: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.gz # Source0-md5: 86b635e1eb2d665cfbef4c6134fe6604 Patch0: %{name}-dbus.patch @@ -15,7 +20,7 @@ BuildRequires: NetworkManager-devel BuildRequires: autoconf >= 2.61 BuildRequires: automake -BuildRequires: gtk-webkit-devel +%{?with_webkit:BuildRequires: gtk-webkit-devel} BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-devel >= 1:2.5 @@ -69,6 +74,18 @@ %description -n python-libproxy -l pl.UTF-8 Wiązania libproxy dla Pythona. +%package networkmanager +Summary: NetworkManager plugin for libproxy +Summary(pl.UTF-8): Wtyczka NetworkManager dla libproxy +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description networkmanager +NetworkManager configuration plugin for libproxy. + +%description networkmanager -l pl.UTF-8 +Wtyczka konfiguracji NetworkManager dla libproxy. + %package gnome Summary: GNOME plugin for libproxy Summary(pl.UTF-8): Wtyczka GNOME dla libproxy @@ -127,7 +144,8 @@ %{__aclocal} %{__autoconf} %{__automake} -%configure +%configure \ + %{!?with_webkit:--without-webkit} %{__make} %install @@ -157,13 +175,12 @@ %dir %{_libdir}/%{name}/%{version}/plugins %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/envvar.so %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/file.so -%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/networkmanager.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libproxy.so %{_libdir}/libproxy.la -%{_includedir}/*.h +%{_includedir}/proxy.h %{_pkgconfigdir}/libproxy-1.0.pc %files static @@ -172,7 +189,11 @@ %files -n python-libproxy %defattr(644,root,root,755) -%{py_sitescriptdir}/*.py[co] +%{py_sitescriptdir}/libproxy.py[co] + +%files networkmanager +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/networkmanager.so %files gnome %defattr(644,root,root,755) @@ -186,9 +207,11 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/mozjs.so +%if %{with webkit} %files webkit %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/webkit.so +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -196,6 +219,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2010/10/10 18:59:40 qboosh +- separated networkmanager plugin +- added webkit bcond + Revision 1.8 2010/09/19 11:55:59 qboosh - better descs for plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libproxy/libproxy.spec?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
