Accepting request 183178 from GNOME:Factory
Push GNOME 3.9.4 - hopefully in the for #oSC13 OBS-URL: https://build.opensuse.org/request/show/183178 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=52
This commit is contained in:
commit
103483ab7f
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user