[libproxy/f14/master: 19/19] Revert the xulrunner-2.0 for f14

[Nicolas Chauvet]

commit 33205b4b7ac88db0b56d3e32ba647a093979ee3e
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu May 5 16:37:42 2011 +0200

    Revert the xulrunner-2.0 for f14

 libproxy-0.4.7-xul2.0.patch |    2 +-
 libproxy.spec               |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/libproxy-0.4.7-xul2.0.patch b/libproxy-0.4.7-xul2.0.patch
index 9f0f85f..d8e458e 100644
--- a/libproxy-0.4.7-xul2.0.patch
+++ b/libproxy-0.4.7-xul2.0.patch
@@ -6,7 +6,7 @@ diff -up libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk.xul libproxy-
    if (WITH_MOZJS)
      foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
 -      pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12)
-+      pkg_search_module(MOZJS ${MOZJSLIB} >=2.0 )
++      pkg_search_module(MOZJS ${MOZJSLIB} >=1.9 )
        if(MOZJS_FOUND)
          include_directories(${MOZJS_INCLUDE_DIRS})
          link_directories(${MOZJS_LIBRARY_DIRS})
diff --git a/libproxy.spec b/libproxy.spec
index 5eb59df..972af21 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -28,6 +28,7 @@ License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}%{?svn}.tar.gz
 Patch0:         libproxy-0.4.7-xul2.0.patch
+Patch1:         libproxy-revert-xul20.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %{?_with_python:BuildRequires:  python-devel}
@@ -187,6 +188,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .xul2
+%patch1 -p1 -R -b .revert
 
 #Fix version field in pkg-config
 sed -i -e 's|@PROJECT_VERSION@|%{version}|' libproxy/libproxy-1.0.pc.in
@@ -286,11 +288,10 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Apr 12 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.7-0.1svn20110412
 - Update to 0.4.7 svn20110412
-- Add support for webkitgtk3
-- Add support for xulrunner 2.0
 - fix #683015 - libproxy fails with autoconfiguration
 - fix #683018 - libproxy needs BR: NetworkManager-glib-devel  (f14)
 - Manually fix libproxy-1.0.pc version field - #664781 / #674854
+- Revert xulrunner 2.0 API change for f14
 
 * Wed Nov 24 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-3
 - Fix mozjs/webkit obsoletion - rhbz#656849