SHA256
1
0
forked from pool/libproxy
OBS User unknown 2009-03-26 22:35:59 +00:00 committed by Git OBS Bridge
parent ae3d478f51
commit d03a1a576e
2 changed files with 20 additions and 5 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Mar 15 00:10:29 CET 2009 - vuntz@novell.com
- Review changes.
-------------------------------------------------------------------
Sat Mar 14 09:41:22 CET 2009 - wr@rosenauer.org
- use correct mozilla/xulrunner dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 23 13:57:01 CET 2009 - vuntz@novell.com Mon Feb 23 13:57:01 CET 2009 - vuntz@novell.com

View File

@ -23,7 +23,7 @@ Name: libproxy
Group: System/Libraries Group: System/Libraries
Summary: libproxy is a library that provides automatic proxy configuration management Summary: libproxy is a library that provides automatic proxy configuration management
Version: 0.2.3 Version: 0.2.3
Release: 4 Release: 5
Source: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.bz2 Source: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.bz2
Patch0: libproxy-0.2.3-dbus.diff Patch0: libproxy-0.2.3-dbus.diff
Patch1: libproxy-svn-277.patch Patch1: libproxy-svn-277.patch
@ -33,11 +33,12 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: python-devel BuildRequires: python-devel
%if 0%{suse_version} < 1110 %if 0%{suse_version} < 1100
BuildRequires: mozilla-xulrunner181-devel %define xulrunner_ver 181
%else %else
BuildRequires: mozilla-xulrunner190-devel %define xulrunner_ver 190
%endif %endif
BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: libwebkit-devel BuildRequires: libwebkit-devel
@ -175,7 +176,7 @@ License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin to support wpad/pac parsing via Mozilla JavaScript Engine Summary: Libproxy plugin to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:firefox) Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver})
Provides: libproxy-mozjs = %{version} Provides: libproxy-mozjs = %{version}
Obsoletes: libproxy-mozjs < %{version} Obsoletes: libproxy-mozjs < %{version}
@ -319,6 +320,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
%{py_sitedir}/*.py %{py_sitedir}/*.py
%changelog %changelog
* Sun Mar 15 2009 vuntz@novell.com
- Review changes.
* Sat Mar 14 2009 wr@rosenauer.org
- use correct mozilla/xulrunner dependencies
* Mon Feb 23 2009 vuntz@novell.com * Mon Feb 23 2009 vuntz@novell.com
- Revert the use of %%{libproxy_shnum}: there are places where the - Revert the use of %%{libproxy_shnum}: there are places where the
macro cannot be used (%%files, eg), and we want don't want to mix macro cannot be used (%%files, eg), and we want don't want to mix