[packages/libproxy] - added mono bcond to skip building C# bindings - switch mozjs to js187
baggins
baggins at pld-linux.org
Thu Jan 1 21:34:54 CET 2015
commit a05585b39a83fad5c89b39d87e2b7f22bd06575b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jan 1 20:34:15 2015 +0000
- added mono bcond to skip building C# bindings
- switch mozjs to js187
libproxy-mozjs.patch | 2 +-
libproxy.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libproxy.spec b/libproxy.spec
index 2f3e4ce..32a4f9d 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -7,6 +7,7 @@
%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
+%bcond_without mono # Mono C# bindings
#
%include /usr/lib/rpm/macros.perl
%include /usr/lib/rpm/macros.mono
@@ -28,11 +29,11 @@ BuildRequires: NetworkManager-devel
BuildRequires: cmake >= 2.6
BuildRequires: glib2-devel >= 1:2.26
%{?with_webkit:BuildRequires: gtk-webkit3-devel >= 1.5.0}
-%{?with_mozjs:BuildRequires: js185-devel}
+%{?with_mozjs:BuildRequires: js187-devel}
%{?with_kde:BuildRequires: kde4-kdelibs-devel}
BuildRequires: libmodman-devel >= 2
BuildRequires: libstdc++-devel
-BuildRequires: mono-csharp
+%{?with_mono:BuildRequires: mono-csharp}
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: pkgconfig
BuildRequires: python-devel >= 1:2.5
@@ -210,7 +211,7 @@ cd build
-DLIBEXEC_INSTALL_DIR=%{_libdir}/libproxy \
-DFORCE_SYSTEM_LIBMODMAN=ON \
-DPERL_VENDORINSTALL=ON \
- -DWITH_DOTNET=ON \
+ %{?with_mono:-DWITH_DOTNET=ON} \
%{!?with_mozjs:-DWITH_MOZJS=OFF} \
-DWITH_VALA=ON \
%{!?with_webkit:-DWITH_WEBKIT=OFF} \
@@ -251,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/libproxy-1.0.pc
%{_datadir}/cmake/Modules/Findlibproxy.cmake
+%if %{with mono}
%files -n dotnet-libproxy-sharp
%defattr(644,root,root,755)
%{_prefix}/lib/mono/gac/libproxy-sharp
@@ -259,6 +261,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_prefix}/lib/mono/libproxy-sharp
%{_pkgconfigdir}/libproxy-sharp-1.0.pc
+%endif
%files -n perl-Net-Libproxy
%defattr(644,root,root,755)
diff --git a/libproxy-mozjs.patch b/libproxy-mozjs.patch
index 2cfd0e8..6ebb0b7 100644
--- a/libproxy-mozjs.patch
+++ b/libproxy-mozjs.patch
@@ -5,7 +5,7 @@
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)
++ pkg_search_module(MOZJS mozjs187>=1.0.0)
if(MOZJS_FOUND)
include_directories(${MOZJS_INCLUDE_DIRS})
link_directories(${MOZJS_LIBRARY_DIRS})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libproxy.git/commitdiff/a05585b39a83fad5c89b39d87e2b7f22bd06575b
More information about the pld-cvs-commit
mailing list