From a129940e1bfe3b5d0ac69134938949dbdb2d432e98f5ceb23ee520016713dbb5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 14 Jul 2013 21:33:22 +0000 Subject: [PATCH 1/2] Accepting request 182821 from home:dirkmueller:branches:GNOME:Factory - use a build conditional for enabling/disabling mono bindings OBS-URL: https://build.opensuse.org/request/show/182821 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=97 --- libproxy.changes | 5 +++++ libproxy.spec | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libproxy.changes b/libproxy.changes index f73daeb..4625e09 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 11 13:13:38 UTC 2013 - dmueller@suse.com + +- use a build conditional for enabling/disabling mono bindings + ------------------------------------------------------------------- Thu Feb 28 18:38:42 UTC 2013 - dmueller@suse.com diff --git a/libproxy.spec b/libproxy.spec index 06e3075..40f147f 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -19,13 +19,9 @@ %define build_core_not_modules 1 %define build_mozjs 0 %if 0%{?suse_version} -%ifnarch %arm ppc64 aarch64 -%define have_mono 1 +%bcond_without mono %else -%define have_mono 0 -%endif -%else -%define have_mono 0 +%bcond_with mono %endif Url: http://code.google.com/p/libproxy/ @@ -79,7 +75,7 @@ BuildRequires: pkgconfig(mozjs185) %endif %endif %else -%if 0%{?have_mono} +%if %{with mono} BuildRequires: mono-devel %endif BuildRequires: perl @@ -184,7 +180,7 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios -%if 0%{?have_mono} +%if %{with mono} %package -n libproxy-sharp Summary: .Net bindings for libproxy @@ -329,7 +325,9 @@ cmake \ -DWITH_DOTNET=OFF \ %else -DWITH_VALA=yes \ - -DWITH_DOTNET=%{have_mono} \ +%if %{with mono} + -DWITH_DOTNET=1 \ +%endif -DFORCE_SYSTEM_LIBMODMAN=ON \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -423,7 +421,7 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc -%if 0%{have_mono} +%if %{with mono} %{_libdir}/pkgconfig/libproxy-sharp-1.0.pc %endif %{_datadir}/cmake/Modules/Findlibproxy.cmake @@ -436,7 +434,7 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %defattr(-, root, root) %{python_sitelib}/*.py -%if 0%{?have_mono} +%if %{with mono} %files -n libproxy-sharp %defattr(-, root, root) From 3b1c97e6622649eb1200fe82d7223b66b7289fc668cf015419ae2a26898694f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 14 Jul 2013 21:36:52 +0000 Subject: [PATCH 2/2] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=98 --- libproxy-plugins.changes | 7 +++++++ libproxy-plugins.spec | 20 +++++++++----------- libproxy.changes | 4 +++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index f73daeb..03fa4dd 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 11 13:13:38 UTC 2013 - dmueller@suse.com + +- Use build conditional (gcond) for enabling/disabling mono + bindings instead of static defines. This allows for osc build + and rpmbuild to be used more flexible. + ------------------------------------------------------------------- Thu Feb 28 18:38:42 UTC 2013 - dmueller@suse.com diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 6ce03d4..4b56898 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -19,13 +19,9 @@ %define build_core_not_modules 0 %define build_mozjs 0 %if 0%{?suse_version} -%ifnarch %arm ppc64 aarch64 -%define have_mono 1 +%bcond_without mono %else -%define have_mono 0 -%endif -%else -%define have_mono 0 +%bcond_with mono %endif Url: http://code.google.com/p/libproxy/ @@ -79,7 +75,7 @@ BuildRequires: pkgconfig(mozjs185) %endif %endif %else -%if 0%{?have_mono} +%if %{with mono} BuildRequires: mono-devel %endif BuildRequires: perl @@ -184,7 +180,7 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios -%if 0%{?have_mono} +%if %{with mono} %package -n libproxy-sharp Summary: .Net bindings for libproxy @@ -329,7 +325,9 @@ cmake \ -DWITH_DOTNET=OFF \ %else -DWITH_VALA=yes \ - -DWITH_DOTNET=%{have_mono} \ +%if %{with mono} + -DWITH_DOTNET=1 \ +%endif -DFORCE_SYSTEM_LIBMODMAN=ON \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -423,7 +421,7 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc -%if 0%{have_mono} +%if %{with mono} %{_libdir}/pkgconfig/libproxy-sharp-1.0.pc %endif %{_datadir}/cmake/Modules/Findlibproxy.cmake @@ -436,7 +434,7 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %defattr(-, root, root) %{python_sitelib}/*.py -%if 0%{?have_mono} +%if %{with mono} %files -n libproxy-sharp %defattr(-, root, root) diff --git a/libproxy.changes b/libproxy.changes index 4625e09..03fa4dd 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Thu Jul 11 13:13:38 UTC 2013 - dmueller@suse.com -- use a build conditional for enabling/disabling mono bindings +- Use build conditional (gcond) for enabling/disabling mono + bindings instead of static defines. This allows for osc build + and rpmbuild to be used more flexible. ------------------------------------------------------------------- Thu Feb 28 18:38:42 UTC 2013 - dmueller@suse.com