From ceb3a49042cea34c7b7d36ffe1f84cb4723589d2 Mon Sep 17 00:00:00 2001
From: kwizart <kwizart@liet.kwizart.net>
Date: Wed, 24 Nov 2010 12:02:09 +0100
Subject: [PATCH] - Fix mozjs/webkit obsoletion - rhbz#656849 - Workaround
 unreliable Version field in pkg-config - rhbz#656484

---
 libproxy.spec | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/libproxy.spec b/libproxy.spec
index 3d95c40..1aa46e0 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -15,7 +15,7 @@
 
 Name:           libproxy
 Version:        0.4.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
@@ -46,6 +46,16 @@ BuildRequires:  dbus-devel
 # kde
 %{?_with_kde:BuildRequires:  kdelibs-devel}
 
+#Obsoletes of disabled subpackages
+%{!?_with_mozjs:
+Provides: %{name}-mozjs = %{version}-101
+Obsoletes: %{name}-mozjs < %{version}-101
+}
+%{!?_with_webkit:
+Provides: %{name}-webkit = %{version}-101
+Obsoletes: %{name}-webkit < %{version}-101
+}
+
 
 %description
 libproxy offers the following features:
@@ -148,6 +158,10 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b.pynoarch
 
+#Fix version field in pkg-config
+sed -i -e 's|@PROJECT_VERSION@|%{version}|' libproxy/libproxy-1.0.pc.in
+
+
 %build
 %{cmake} \
   -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
@@ -234,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 24 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-2
+- Fix mozjs/webkit obsoletion - rhbz#656849
+- Workaround unreliable Version field in pkg-config - rhbz#656484
+
 * Sun Nov 07 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-1
 - Update to 0.4.6
 - Fix python module not arch dependant