temporarily disable webkit from libproxy to resolve a circular dep

This commit is contained in:
Nathaniel McCallum 2010-07-05 18:07:17 +00:00
parent c7c7d9241c
commit 18886f288b

View File

@ -4,7 +4,7 @@
Name: libproxy
Version: 0.4.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A library handling all the details of proxy configuration
Group: System Environment/Libraries
@ -26,7 +26,7 @@ BuildRequires: gecko-devel
BuildRequires: NetworkManager-devel
BuildRequires: dbus-devel
# webkit (gtk)
BuildRequires: WebKit-gtk-devel
#BuildRequires: WebKit-gtk-devel
# kde
BuildRequires: kdelibs-devel
@ -96,15 +96,15 @@ Requires: %{name} = %{version}
The %{name}-networkmanager package contains the %{name} plugin
for networkmanager.
%package webkit
Summary: Plugin for %{name} and webkit
Group: System Environment/Libraries
Requires: %{name} = %{version}
Provides: %{name}-pac = %{version}-%{release}
#%package webkit
#Summary: Plugin for %{name} and webkit
#Group: System Environment/Libraries
#Requires: %{name} = %{version}
#Provides: %{name}-pac = %{version}-%{release}
%description webkit
The %{name}-webkit package contains the %{name} plugin for
webkit.
#%description webkit
#The %{name}-webkit package contains the %{name} plugin for
#webkit.
%package devel
Summary: Development files for %{name}
@ -175,9 +175,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
%files webkit
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
#%files webkit
#%defattr(-,root,root,-)
#%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
%files devel
%defattr(-,root,root,-)
@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-3
- Disable webkit subpackage in order to resolve circular dep
* Sat Jul 03 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-2
- Fix missing BuildRequires: libmodman-devel