Accepting request 186200 from GNOME:Factory
Let's see who dares reviewing this :) (forwarded request 186180 from Zaitor) OBS-URL: https://build.opensuse.org/request/show/186200 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=53
This commit is contained in:
commit
98d8af79e9
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 2 14:41:10 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Build mono, perl and python sub package while building -plugins
|
||||
instead of the main package. This helps keeping the build deps
|
||||
for the main package minimal.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 11 13:13:38 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
@ -73,14 +73,13 @@ BuildRequires: libqt4-devel
|
||||
%if %{build_mozjs}
|
||||
BuildRequires: pkgconfig(mozjs185)
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%if %{with mono}
|
||||
BuildRequires: mono-devel
|
||||
%endif
|
||||
BuildRequires: perl
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
@ -143,61 +142,6 @@ 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
|
||||
|
||||
%package -n python-libproxy
|
||||
Summary: Python bindings for libproxy
|
||||
Group: System/Libraries
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%py_requires
|
||||
%endif
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n python-libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
|
||||
%package -n perl-Net-Libproxy
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%package -n libproxy-sharp
|
||||
Summary: .Net bindings for libproxy
|
||||
Group: Development/Languages/Mono
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n libproxy-sharp
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
%endif
|
||||
|
||||
%else
|
||||
|
||||
%if 0%{?favor_gtk2}
|
||||
@ -302,6 +246,60 @@ Supplements: packageand(libproxy1:NetworkManager)
|
||||
A module to extend libproxy with capabilities to query NetworkManager
|
||||
about network configuration changes.
|
||||
|
||||
%package -n python-libproxy
|
||||
Summary: Python bindings for libproxy
|
||||
Group: System/Libraries
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%py_requires
|
||||
%endif
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n python-libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%package -n perl-Net-Libproxy
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%package -n libproxy-sharp
|
||||
Summary: .Net bindings for libproxy
|
||||
Group: Development/Languages/Mono
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n libproxy-sharp
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -340,8 +338,10 @@ cmake \
|
||||
-DINCLUDE_INSTALL_DIR=%{_includedir} \
|
||||
-DPERL_VENDORINSTALL=yes \
|
||||
-DBIPR=0 \
|
||||
%if ! %build_core_not_modules
|
||||
%if %build_core_not_modules
|
||||
-DWITH_DOTNET=OFF \
|
||||
-DWITH_PERL=OFF \
|
||||
-DWITH_PYTHON=OFF \
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1120
|
||||
-DCMAKE_BUILD_TYPE=DebugFull \
|
||||
@ -381,12 +381,9 @@ rm -f %{buildroot}%{_includedir}/*.h
|
||||
# Delete all files that exist in the base libproxy package
|
||||
rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe}
|
||||
rm -f %{buildroot}%{_libdir}/libproxy.*
|
||||
rm -f %{buildroot}%{python_sitelib}/*.py
|
||||
rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
|
||||
rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake
|
||||
rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi
|
||||
rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm
|
||||
rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -421,37 +418,12 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%if ! 0%{?windows}
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/libproxy-1.0.pc
|
||||
%if %{with mono}
|
||||
%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc
|
||||
%endif
|
||||
%{_datadir}/cmake/Modules/Findlibproxy.cmake
|
||||
%dir %{_datadir}/vala
|
||||
%dir %{_datadir}/vala/vapi
|
||||
%{_datadir}/vala/vapi/libproxy-1.0.vapi
|
||||
%endif
|
||||
|
||||
%files -n python-libproxy
|
||||
%defattr(-, root, root)
|
||||
%{python_sitelib}/*.py
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%files -n libproxy-sharp
|
||||
%defattr(-, root, root)
|
||||
%{_assemblies_dir}/gac/libproxy-sharp
|
||||
%{_assemblies_dir}/libproxy-sharp
|
||||
%endif
|
||||
|
||||
%if ! 0%{?windows}
|
||||
|
||||
%files -n perl-Net-Libproxy
|
||||
%defattr(-,root,root)
|
||||
%dir %{perl_vendorarch}/Net
|
||||
%dir %{perl_vendorarch}/auto/Net
|
||||
%dir %{perl_vendorarch}/auto/Net/Libproxy
|
||||
%{perl_vendorarch}/Net/Libproxy.pm
|
||||
%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%endif
|
||||
%else
|
||||
|
||||
%if ! 0%{?windows}
|
||||
@ -487,6 +459,27 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so
|
||||
%endif
|
||||
|
||||
%files -n python-libproxy
|
||||
%defattr(-, root, root)
|
||||
%{python_sitelib}/*.py
|
||||
|
||||
%files -n perl-Net-Libproxy
|
||||
%defattr(-,root,root)
|
||||
%dir %{perl_vendorarch}/Net
|
||||
%dir %{perl_vendorarch}/auto/Net
|
||||
%dir %{perl_vendorarch}/auto/Net/Libproxy
|
||||
%{perl_vendorarch}/Net/Libproxy.pm
|
||||
%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%files -n libproxy-sharp
|
||||
%defattr(-, root, root)
|
||||
%{_assemblies_dir}/gac/libproxy-sharp
|
||||
%{_assemblies_dir}/libproxy-sharp
|
||||
%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 2 14:41:10 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Build mono, perl and python sub package while building -plugins
|
||||
instead of the main package. This helps keeping the build deps
|
||||
for the main package minimal.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 11 13:13:38 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
165
libproxy.spec
165
libproxy.spec
@ -73,14 +73,13 @@ BuildRequires: libqt4-devel
|
||||
%if %{build_mozjs}
|
||||
BuildRequires: pkgconfig(mozjs185)
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%if %{with mono}
|
||||
BuildRequires: mono-devel
|
||||
%endif
|
||||
BuildRequires: perl
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
@ -143,61 +142,6 @@ 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
|
||||
|
||||
%package -n python-libproxy
|
||||
Summary: Python bindings for libproxy
|
||||
Group: System/Libraries
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%py_requires
|
||||
%endif
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n python-libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
|
||||
%package -n perl-Net-Libproxy
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%package -n libproxy-sharp
|
||||
Summary: .Net bindings for libproxy
|
||||
Group: Development/Languages/Mono
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n libproxy-sharp
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
%endif
|
||||
|
||||
%else
|
||||
|
||||
%if 0%{?favor_gtk2}
|
||||
@ -302,6 +246,60 @@ Supplements: packageand(libproxy1:NetworkManager)
|
||||
A module to extend libproxy with capabilities to query NetworkManager
|
||||
about network configuration changes.
|
||||
|
||||
%package -n python-libproxy
|
||||
Summary: Python bindings for libproxy
|
||||
Group: System/Libraries
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%py_requires
|
||||
%endif
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n python-libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%package -n perl-Net-Libproxy
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%package -n libproxy-sharp
|
||||
Summary: .Net bindings for libproxy
|
||||
Group: Development/Languages/Mono
|
||||
Requires: libproxy1 = %{version}
|
||||
|
||||
%description -n libproxy-sharp
|
||||
libproxy offers the following features: * extremely small core
|
||||
footprint (< 35K)
|
||||
|
||||
* no external dependencies within libproxy core (libproxy modules
|
||||
may have dependencies)
|
||||
* only 3 functions in the stable external API
|
||||
* dynamic adjustment to changing network topology
|
||||
* a standard way of dealing with proxy settings across all scenarios
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -340,8 +338,10 @@ cmake \
|
||||
-DINCLUDE_INSTALL_DIR=%{_includedir} \
|
||||
-DPERL_VENDORINSTALL=yes \
|
||||
-DBIPR=0 \
|
||||
%if ! %build_core_not_modules
|
||||
%if %build_core_not_modules
|
||||
-DWITH_DOTNET=OFF \
|
||||
-DWITH_PERL=OFF \
|
||||
-DWITH_PYTHON=OFF \
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1120
|
||||
-DCMAKE_BUILD_TYPE=DebugFull \
|
||||
@ -381,12 +381,9 @@ rm -f %{buildroot}%{_includedir}/*.h
|
||||
# Delete all files that exist in the base libproxy package
|
||||
rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe}
|
||||
rm -f %{buildroot}%{_libdir}/libproxy.*
|
||||
rm -f %{buildroot}%{python_sitelib}/*.py
|
||||
rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
|
||||
rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake
|
||||
rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi
|
||||
rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm
|
||||
rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -421,37 +418,12 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%if ! 0%{?windows}
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/libproxy-1.0.pc
|
||||
%if %{with mono}
|
||||
%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc
|
||||
%endif
|
||||
%{_datadir}/cmake/Modules/Findlibproxy.cmake
|
||||
%dir %{_datadir}/vala
|
||||
%dir %{_datadir}/vala/vapi
|
||||
%{_datadir}/vala/vapi/libproxy-1.0.vapi
|
||||
%endif
|
||||
|
||||
%files -n python-libproxy
|
||||
%defattr(-, root, root)
|
||||
%{python_sitelib}/*.py
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%files -n libproxy-sharp
|
||||
%defattr(-, root, root)
|
||||
%{_assemblies_dir}/gac/libproxy-sharp
|
||||
%{_assemblies_dir}/libproxy-sharp
|
||||
%endif
|
||||
|
||||
%if ! 0%{?windows}
|
||||
|
||||
%files -n perl-Net-Libproxy
|
||||
%defattr(-,root,root)
|
||||
%dir %{perl_vendorarch}/Net
|
||||
%dir %{perl_vendorarch}/auto/Net
|
||||
%dir %{perl_vendorarch}/auto/Net/Libproxy
|
||||
%{perl_vendorarch}/Net/Libproxy.pm
|
||||
%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%endif
|
||||
%else
|
||||
|
||||
%if ! 0%{?windows}
|
||||
@ -487,6 +459,27 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so
|
||||
%endif
|
||||
|
||||
%files -n python-libproxy
|
||||
%defattr(-, root, root)
|
||||
%{python_sitelib}/*.py
|
||||
|
||||
%files -n perl-Net-Libproxy
|
||||
%defattr(-,root,root)
|
||||
%dir %{perl_vendorarch}/Net
|
||||
%dir %{perl_vendorarch}/auto/Net
|
||||
%dir %{perl_vendorarch}/auto/Net/Libproxy
|
||||
%{perl_vendorarch}/Net/Libproxy.pm
|
||||
%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
|
||||
|
||||
%if %{with mono}
|
||||
|
||||
%files -n libproxy-sharp
|
||||
%defattr(-, root, root)
|
||||
%{_assemblies_dir}/gac/libproxy-sharp
|
||||
%{_assemblies_dir}/libproxy-sharp
|
||||
%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user