rpms/libproxy/devel libproxy.spec,1.20,1.21
Nathaniel McCallum
npmccallum at fedoraproject.org
Mon Jul 5 19:41:16 UTC 2010
Author: npmccallum
Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2448
Modified Files:
libproxy.spec
Log Message:
Re-enable mozjs and webkit in libproxy
Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libproxy.spec 5 Jul 2010 19:26:52 -0000 1.20
+++ libproxy.spec 5 Jul 2010 19:41:16 -0000 1.21
@@ -4,7 +4,7 @@
Name: libproxy
Version: 0.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A library handling all the details of proxy configuration
Group: System Environment/Libraries
@@ -21,12 +21,12 @@ BuildRequires: cmake >= 2.6.0
BuildRequires: GConf2-devel
BuildRequires: libXmu-devel
# mozjs
-#BuildRequires: gecko-devel
+BuildRequires: gecko-devel
# NetworkManager
BuildRequires: NetworkManager-devel
BuildRequires: dbus-devel
# webkit (gtk)
-#BuildRequires: WebKit-gtk-devel
+BuildRequires: WebKit-gtk-devel
# kde
BuildRequires: kdelibs-devel
@@ -76,16 +76,16 @@ Requires: %{name} = %{version}-%{r
%description kde
The %{name}-kde package contains the %{name} plugin for kde.
-#%package mozjs
-#Summary: Plugin for %{name} and mozjs
-#Group: System Environment/Libraries
-#Requires: %{name} = %{version}
+%package mozjs
+Summary: Plugin for %{name} and mozjs
+Group: System Environment/Libraries
+Requires: %{name} = %{version}
#Tweak this according to the current gecko-libs version
-#Requires: gecko-libs >= %{gecko_version}
-#Provides: %{name}-pac = %{version}-%{release}
+Requires: gecko-libs >= %{gecko_version}
+Provides: %{name}-pac = %{version}-%{release}
-#%description mozjs
-#The %{name}-mozjs package contains the %{name} plugin for mozjs.
+%description mozjs
+The %{name}-mozjs package contains the %{name} plugin for mozjs.
%package networkmanager
Summary: Plugin for %{name} and networkmanager
@@ -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}
-
-#%description webkit
-#The %{name}-webkit package contains the %{name} plugin for
-#webkit.
+%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.
%package devel
Summary: Development files for %{name}
@@ -167,17 +167,17 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/config_kde4.so
-#%files mozjs
-#%defattr(-,root,root,-)
-#%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
+%files mozjs
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
%files networkmanager
%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 at natemccallum.com> - 0.4.4-5
+- Re-enable mozjs and webkit
+
* Mon Jul 05 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 0.4.4-4
- Disable mozjs to get around a build error temporarily
More information about the scm-commits
mailing list