- new URLs, updated to 0.4.12

- updated mozjs patch

diff --git a/libproxy-mozjs.patch b/libproxy-mozjs.patch
index 6ebb0b78cc5a70890abd575d2a791cc1be08126a..0e6b48cc36ab478c2e403a6732607e6673826f53 100644 (file)
--- a/libproxy-mozjs.patch
+++ b/libproxy-mozjs.patch
@@ -1,11 +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
+--- libproxy-0.4.12/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig    2016-03-02 10:39:39.875263314 +0100
++++ libproxy-0.4.12/libproxy/cmake/modules/pacrunner_mozjs.cmk 2016-03-02 10:43:12.361921064 +0100
 @@ -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 mozjs187>=1.0.0)
+-    pkg_search_module(MOZJS mozjs185)
++    pkg_search_module(MOZJS mozjs187)
      if(MOZJS_FOUND)
        include_directories(${MOZJS_INCLUDE_DIRS})
        link_directories(${MOZJS_LIBRARY_DIRS})

diff --git a/libproxy.spec b/libproxy.spec
index 23747e412a41035cc1bdf3c87127a9983bcca0d0..6c0fc6c1c7791aea3c4ab6b7d2801626662eb9bc 100644 (file)
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -3,7 +3,7 @@
 # - ruby binding (not finished as of 0.4.8 - no buildsystem)
 #
 # Conditional build:
-%bcond_without kde             # KDE4 config plugin
+%bcond_without kde             # KDE 4/5 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
@@ -17,22 +17,23 @@
 Summary:       Library for automatic proxy configuration management
 Summary(pl.UTF-8):     Biblioteka do automatycznego zarządzania konfiguracją proxy
 Name:          libproxy
-Version:       0.4.11
-Release:       9
+Version:       0.4.12
+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: 3cd1ae2a4abecf44b3f24d6639d2cd84
+#Source0Download: https://github.com/libproxy/libproxy/releases
+Source0:       https://github.com/libproxy/libproxy/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 258d89cc052e0a3c09aa1f42d7f93045
 Patch0:                %{name}-pac-modules.patch
 Patch1:                %{name}-mozjs.patch
-URL:           http://code.google.com/p/libproxy/
+URL:           https://libproxy.github.io/libproxy/
 BuildRequires: NetworkManager-devel
 %{?with_kde:BuildRequires:     automoc4}
 BuildRequires: cmake >= 2.6
 BuildRequires: glib2-devel >= 1:2.26
 %{?with_webkit:BuildRequires:  gtk-webkit3-devel >= 1.5.0}
 %{?with_mozjs:BuildRequires:   js187-devel}
+# or kf5-conf kreadconfig5
 %{?with_kde:BuildRequires:     kde4-kdelibs-devel}
 BuildRequires: libmodman-devel >= 2
 BuildRequires: libstdc++-devel
@@ -215,7 +216,7 @@ cd build
        -DFORCE_SYSTEM_LIBMODMAN=ON \
        -DPERL_VENDORINSTALL=ON \
        -DPYTHON_SITEPKG_DIR=%{py_sitescriptdir} \
-       %{?with_mono:-DWITH_DOTNET=ON} \
+       %{?with_mono:-DWITH_DOTNET=ON -DGMCS_EXECUTABLE=/usr/bin/mcs} \
        %{!?with_mozjs:-DWITH_MOZJS=OFF} \
        -DWITH_VALA=ON \
        %{!?with_webkit:-DWITH_WEBKIT=OFF} \
@@ -293,7 +294,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with kde}
 %files kde
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_kde4.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_kde.so
 %endif
 
 %if %{with mozjs}