rpms/libproxy
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable mozjs and webkit in libproxy

Browse Source
This commit is contained in:
Nathaniel McCallum 2010-07-05 19:41:16 +00:00
parent 0a9f046bb3
commit 722f308c3a
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libproxy.spec
View File

@ -4,7 +4,7 @@
Name: libproxy Name: libproxy
Version: 0.4.4 Version: 0.4.4
Release: 4%{?dist} Release: 5%{?dist}
Summary: A library handling all the details of proxy configuration Summary: A library handling all the details of proxy configuration
Group: System Environment/Libraries Group: System Environment/Libraries
@ -21,12 +21,12 @@ BuildRequires: cmake >= 2.6.0
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
BuildRequires: libXmu-devel BuildRequires: libXmu-devel
# mozjs # mozjs
#BuildRequires: gecko-devel BuildRequires: gecko-devel
# NetworkManager # NetworkManager
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
# webkit (gtk) # webkit (gtk)
#BuildRequires: WebKit-gtk-devel BuildRequires: WebKit-gtk-devel
# kde # kde
BuildRequires: kdelibs-devel BuildRequires: kdelibs-devel
@ -76,16 +76,16 @@ Requires: %{name} = %{version}-%{release}
%description kde %description kde
The %{name}-kde package contains the %{name} plugin for kde. The %{name}-kde package contains the %{name} plugin for kde.
#%package mozjs %package mozjs
#Summary: Plugin for %{name} and mozjs Summary: Plugin for %{name} and mozjs
#Group: System Environment/Libraries Group: System Environment/Libraries
#Requires: %{name} = %{version} Requires: %{name} = %{version}
#Tweak this according to the current gecko-libs version #Tweak this according to the current gecko-libs version
#Requires: gecko-libs >= %{gecko_version} Requires: gecko-libs >= %{gecko_version}
#Provides: %{name}-pac = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release}
#%description mozjs %description mozjs
#The %{name}-mozjs package contains the %{name} plugin for mozjs. The %{name}-mozjs package contains the %{name} plugin for mozjs.
%package networkmanager %package networkmanager
Summary: Plugin for %{name} and networkmanager Summary: Plugin for %{name} and networkmanager
@ -96,15 +96,15 @@ Requires: %{name} = %{version}
The %{name}-networkmanager package contains the %{name} plugin The %{name}-networkmanager package contains the %{name} plugin
for networkmanager. for networkmanager.
#%package webkit %package webkit
#Summary: Plugin for %{name} and webkit Summary: Plugin for %{name} and webkit
#Group: System Environment/Libraries Group: System Environment/Libraries
#Requires: %{name} = %{version} Requires: %{name} = %{version}
#Provides: %{name}-pac = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release}
#%description webkit %description webkit
#The %{name}-webkit package contains the %{name} plugin for The %{name}-webkit package contains the %{name} plugin for
#webkit. webkit.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
@ -167,17 +167,17 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/config_kde4.so %{_libdir}/%{name}/%{version}/modules/config_kde4.so
#%files mozjs %files mozjs
#%defattr(-,root,root,-) %defattr(-,root,root,-)
#%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
%files networkmanager %files networkmanager
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
#%files webkit %files webkit
#%defattr(-,root,root,-) %defattr(-,root,root,-)
#%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-5
- Re-enable mozjs and webkit
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-4 * Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-4
- Disable mozjs to get around a build error temporarily - Disable mozjs to get around a build error temporarily