libproxy-0.4.15-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11377 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libp/libproxy/libproxy-vl.spec

@@ -1,38 +1,51 @@
-%{!?python_sitelib: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%bcond_with mozjs
+
+%define _unpackaged_files_terminate_build 1
 
 Summary:        A library handling all the details of proxy configuration
 Name:           libproxy
-Version:        0.4.11
-Release:        2%{?_dist_release}
+Version:        0.4.15
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://code.google.com/p/libproxy/
-Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
+URL:            http://libproxy.github.io/libproxy
+Source0:        https://github.com/libproxy/libproxy/releases/download/%{version}/libproxy-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  python3-devel
 #Virtual Provides - We need either mozjs or WebKit
+%if %{with mozjs}
 Requires: %{name}-pac >= %{version}
+%endif
 #
 Requires: libproxy-python = %{version}-%{release}
 Requires: libproxy-bin = %{version}-%{release}
 
+Obsoletes: %{name}-mozjs < 1.4.15
+Obsoletes: %{name}-webkitgtk3 < 1.4.15
+
 BuildRequires:  cmake
 # gnome
 BuildRequires:  GConf2-devel
+%if %{with mozjs}
 # mozjs
-BuildRequires:  js-devel
+BuildRequires:  mozjs >= 38
+%endif
 # NetworkManager
 BuildRequires:  NetworkManager-devel
 BuildRequires:  dbus-devel
+BuildRequires:  glib2
 # webkit (gtk)
-BuildRequires:  WebKit3-gtk-devel
+BuildRequires:  webkitgtk4-devel
 # kde
 BuildRequires:	kdelibs-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libX11-devel
 
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-rpm-macros
 
 Provides: %{name}-webkit = %{version}-%{release}
 Obsoletes: %{name}-webkit < %{version}-%{release}
@@ -71,6 +84,14 @@ Requires:       %{name} = %{version}-%{release}
 %description    python
 The %{name}-python package contains the python binding for %{name}
 
+%package        python3
+Summary:        Binding for %{name} and python
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    python3
+The %{name}-python package contains the python binding for %{name}
+
 %package        gnome
 Summary:        Plugin for %{name} and gnome
 Group:          System Environment/Libraries
@@ -87,6 +108,7 @@ Requires:       %{name} = %{version}-%{release}
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
 
+%if %{with mozjs}
 %package        mozjs
 Summary:        Plugin for %{name} and mozjs
 Group:          System Environment/Libraries
@@ -98,16 +120,18 @@ Provides:       %{name}-pac = %{version}-%{release}
 %description    mozjs
 The %{name}-mozjs package contains the %{name} plugin for mozjs.
 
-%package        webkitgtk3
-Summary:        Plugin for %{name} and webkitgtk3
+%package        webkitgtk4
+Summary:        Plugin for %{name} and webkitgtk4
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}
 Provides:       %{name}-pac = %{version}-%{release}
 
-%description    webkitgtk3
+%description    webkitgtk4
 The %{name}-webkitgtk3 package contains the %{name} plugin for
 webkitgtk3.
 
+%endif
+
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -121,7 +145,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
+#sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
 
 %build
 %cmake \
@@ -129,6 +153,7 @@ sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
 	-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
 	-DWITH_PERL=OFF \
 	-DWITH_WEBKIT3=ON \
+	-DWITH_KDE=ON \
    .
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -165,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitelib}/libproxy.py
 
+%files python3
+%defattr(-,root,root,-)
+%{python3_sitelib}/libproxy.py
+
 %files gnome
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/config_gnome3.so
@@ -172,15 +201,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files kde
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/modules/config_kde4.so
+%{_libdir}/%{name}/%{version}/modules/config_kde.so
 
+# Build the pacrunner into libproxy unless we are building for multiple engines
+%if %{with mozjs}
 %files mozjs
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 
-%files webkitgtk3
+%files webkitgtk4
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -191,6 +223,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-1
+- updated to 0.4.15.
+- enabled python3 support.
+- disabled mozjs as default.
+- switched to webkitgtk4.
+
 * Thu Jul 07 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.11-2
 - rebuild with gcc-5.4.0