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

Disable mozjs to get around a build error temporarily

Browse Source
This commit is contained in:
Nathaniel McCallum 2010-07-05 19:26:52 +00:00
parent 18886f288b
commit 0a9f046bb3
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libproxy.spec
View File

@ -4,7 +4,7 @@
Name: libproxy Name: libproxy
Version: 0.4.4 Version: 0.4.4
Release: 3%{?dist} Release: 4%{?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,7 +21,7 @@ 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
@ -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
@ -167,9 +167,9 @@ 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,-)
@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-4
- Disable mozjs to get around a build error temporarily
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-3 * Mon Jul 05 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.4.4-3
- Disable webkit subpackage in order to resolve circular dep - Disable webkit subpackage in order to resolve circular dep