- updated to 1.4.8

- updated pac-modules patch
- mozjs plugin is now based on js185; added mozjs patch to fix detection

diff --git a/libproxy-mozjs.patch b/libproxy-mozjs.patch
new file mode 100644 (file)
index 0000000..2cfd0e8
--- /dev/null
+++ b/libproxy-mozjs.patch
@@ -0,0 +1,11 @@
+--- libproxy-0.4.8/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig     2012-10-02 16:32:15.000000000 +0200
++++ libproxy-0.4.8/libproxy/cmake/modules/pacrunner_mozjs.cmk  2012-10-05 18:27:40.728713943 +0200
+@@ -9,7 +9,7 @@
+ elseif(NOT APPLE)
+   option(WITH_MOZJS "Search for MOZJS package" ON)
+   if (WITH_MOZJS)
+-    pkg_search_module(MOZJS mozjs185>=1.8.5)
++    pkg_search_module(MOZJS mozjs185>=1.0.0)
+     if(MOZJS_FOUND)
+       include_directories(${MOZJS_INCLUDE_DIRS})
+       link_directories(${MOZJS_LIBRARY_DIRS})

diff --git a/libproxy-pac-modules.patch b/libproxy-pac-modules.patch
index 0fb0d93bc5fc5440fcc8bb2969fdfeafb0eaaaf7..690cec65bbb05d2fb6e27200a138f71c49c3abc3 100644 (file)
--- a/libproxy-pac-modules.patch
+++ b/libproxy-pac-modules.patch
@@ -1,11 +1,11 @@
 Always build pacrunners as separate modules, not libproxy builtins
---- libproxy-0.4.7/libproxy/cmake/modules.cmk.orig     2011-06-06 23:44:37.000000000 +0200
-+++ libproxy-0.4.7/libproxy/cmake/modules.cmk  2011-06-10 14:25:54.438874361 +0200
+--- libproxy-0.4.8/libproxy/cmake/modules.cmk.orig     2012-10-05 17:15:58.655470278 +0200
++++ libproxy-0.4.8/libproxy/cmake/modules.cmk  2012-10-05 17:47:10.435431265 +0200
 @@ -19,10 +19,7 @@
  include(cmake/modules/pacrunner_webkit.cmk)
  
  # Build the pacrunner into libproxy unless we are building for multiple engines
--set(BIPR 1)
+-set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR")
 -if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND))
 -  set(BIPR 0)
 -endif()

diff --git a/libproxy.spec b/libproxy.spec
index c1b2b55570143a49f14aa1f8b361295b17f44a8a..d67ff41d9963c8edb7b28075a6194b80337b49a6 100644 (file)
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -1,29 +1,34 @@
-# TODO: natus-based pacrunner (doesn't build with natus 0.2.1)
+# TODO:
+# - natus-based pacrunner (doesn't build with natus 0.2.1)
+# - ruby binding (not finished as of 0.4.8 - no buildsystem)
 #
 # Conditional build:
-%bcond_without kde             # KDE4 plugin
-%bcond_without webkit          # WebKit plugin
-%bcond_without xulrunner       # xulrunner plugin
+%bcond_without kde             # KDE4 config plugin
+%bcond_without mozjs           # MozJS pacrunner plugin
+%bcond_with    natus           # Natus pacrunner plugin [doesn't build with natus 0.2.1]
+%bcond_without webkit          # WebKit pacrunner plugin
 #
 %include       /usr/lib/rpm/macros.perl
 %include       /usr/lib/rpm/macros.mono
 Summary:       Library for automatic proxy configuration management
 Summary(pl.UTF-8):     Biblioteka do automatycznego zarządzania konfiguracją proxy
 Name:          libproxy
-Version:       0.4.7
-Release:       2
+Version:       0.4.8
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0Download: http://code.google.com/p/libproxy/downloads/list
 Source0:       http://libproxy.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 509e03a488a61cd62bfbaf3ab6a2a7a5
+# Source0-md5: b7d0c7b4f849895fbf1d1b5fb720b296
 Patch0:                %{name}-pac-modules.patch
+Patch1:                %{name}-mozjs.patch
 URL:           http://code.google.com/p/libproxy/
 BuildRequires: NetworkManager-devel
 %{?with_kde:BuildRequires:     automoc4}
 BuildRequires: cmake >= 2.6
 BuildRequires: glib2-devel >= 1:2.26
-%{?with_webkit:BuildRequires:  gtk-webkit3-devel}
+%{?with_webkit:BuildRequires:  gtk-webkit3-devel >= 1.5.0}
+%{?with_mozjs:BuildRequires:   js185-devel}
 %{?with_kde:BuildRequires:     kde4-kdelibs-devel}
 BuildRequires: libmodman-devel >= 2
 BuildRequires: libstdc++-devel
@@ -40,9 +45,9 @@ BuildRequires:        rpm-perlprov >= 4.1-13
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: rpmbuild(monoautodeps)
+BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXmu-devel
-%{?with_xulrunner:BuildRequires:       xulrunner-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -180,6 +185,7 @@ Summary:    WebKit plugin for libproxy
 Summary(pl.UTF-8):     Wtyczka WebKit dla libproxy
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      gtk-webkit3 >= 1.5.0
 
 %description webkit
 WebKit (JavaScriptCore) configuration plugin for libproxy.
@@ -190,6 +196,11 @@ Wtyczka konfigracji WebKit (JavaScriptCore) dla libproxy.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+%if %{without natus}
+echo 'set(NATUS_FOUND 0)' > libproxy/cmake/modules/pacrunner_natus.cmk
+%endif
 
 %build
 install -d build
@@ -200,7 +211,7 @@ cd build
        -DFORCE_SYSTEM_LIBMODMAN=ON \
        -DPERL_VENDORINSTALL=ON \
        -DWITH_DOTNET=ON \
-       %{!?with_xulrunner:-DWITH_MOZJS=OFF} \
+       %{!?with_mozjs:-DWITH_MOZJS=OFF} \
        -DWITH_VALA=ON \
        %{!?with_webkit:-DWITH_WEBKIT=OFF} \
        %{?with_webkit:-DWITH_WEBKIT3=ON}
@@ -279,7 +290,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_kde4.so
 %endif
 
-%if %{with xulrunner}
+%if %{with mozjs}
 %files mozjs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so