From d03a1a576e1a41e7ce3894819ca8d276cae7c629caf04592c7c7af03815a9249 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Mar 2009 22:35:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=4 --- libproxy.changes | 10 ++++++++++ libproxy.spec | 15 ++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libproxy.changes b/libproxy.changes index ba1cc35..48e4c6c 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -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 diff --git a/libproxy.spec b/libproxy.spec index c0fedd4..2ea8889 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -23,7 +23,7 @@ Name: libproxy Group: System/Libraries Summary: libproxy is a library that provides automatic proxy configuration management Version: 0.2.3 -Release: 4 +Release: 5 Source: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.bz2 Patch0: libproxy-0.2.3-dbus.diff Patch1: libproxy-svn-277.patch @@ -33,11 +33,12 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: gconf2-devel BuildRequires: NetworkManager-devel BuildRequires: python-devel -%if 0%{suse_version} < 1110 -BuildRequires: mozilla-xulrunner181-devel +%if 0%{suse_version} < 1100 +%define xulrunner_ver 181 %else -BuildRequires: mozilla-xulrunner190-devel +%define xulrunner_ver 190 %endif +BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel BuildRequires: dbus-1-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 Group: System/Libraries Requires: libproxy0 = %{version} -Supplements: packageand(libproxy0:firefox) +Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver}) Provides: libproxy-mozjs = %{version} Obsoletes: libproxy-mozjs < %{version} @@ -319,6 +320,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{py_sitedir}/*.py %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 - 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