From 20f1af4a2cc11e038a57f65889898d9b04d9a85b Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sep 06 2010 14:58:05 +0000
Subject: - Update to 0.4.5

- Disable mozjs on fedora >= 15

---

diff --git a/.gitignore b/.gitignore
index c02531f..a7c68b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libproxy-0.4.4.tar.gz
+/libproxy-0.4.5.tar.gz
diff --git a/libproxy-0.4.4-fix_pkgconfig.patch b/libproxy-0.4.4-fix_pkgconfig.patch
deleted file mode 100644
index 1a6317d..0000000
--- a/libproxy-0.4.4-fix_pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libproxy-0.4.4/libproxy/libproxy-1.0.pc.in.fix libproxy-0.4.4/libproxy/libproxy-1.0.pc.in
---- libproxy-0.4.4/libproxy/libproxy-1.0.pc.in.fix	2010-07-13 09:58:27.000000000 +0200
-+++ libproxy-0.4.4/libproxy/libproxy-1.0.pc.in	2010-07-13 10:00:26.000000000 +0200
-@@ -1,6 +1,6 @@
--prefix=@prefix@
--libdir=@libdir@
--includedir=@includedir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_LIBDIR@
-+includedir=@CMAKE_INSTALL_PREFIX@/include
- 
- Name: libproxy-1.0
- Description: Proxy Configuration Library
diff --git a/libproxy.spec b/libproxy.spec
index 0844da5..4106365 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -1,17 +1,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %global gecko_version 1.9.2
+%if 0%{?fedora} < 15
+%global _with_mozjs 1
+%endif
 
 Name:           libproxy
-Version:        0.4.4
-Release:        8%{?dist}
+Version:        0.4.5
+Release:        1%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
-Patch0:         libproxy-0.4.4-fix_pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -22,7 +24,7 @@ BuildRequires:  cmake >= 2.6.0
 BuildRequires:  GConf2-devel
 BuildRequires:  libXmu-devel
 # mozjs
-BuildRequires:  gecko-devel
+%{?_with_mozjs:BuildRequires:  gecko-devel}
 # NetworkManager
 BuildRequires:  NetworkManager-devel
 BuildRequires:  dbus-devel
@@ -77,6 +79,7 @@ Requires:       %{name} = %{version}-%{release}
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
 
+%{?_with_mozjs:
 %package        mozjs
 Summary:        Plugin for %{name} and mozjs
 Group:          System Environment/Libraries
@@ -87,6 +90,7 @@ Provides:       %{name}-pac = %{version}-%{release}
 
 %description    mozjs
 The %{name}-mozjs package contains the %{name} plugin for mozjs.
+}
 
 %package        networkmanager
 Summary:        Plugin for %{name} and networkmanager
@@ -119,7 +123,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix_pc
 
 %build
 %{cmake} \
@@ -169,9 +172,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/config_kde4.so
 
+%{?_with_mozjs:
 %files mozjs
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
+}
 
 %files networkmanager
 %defattr(-,root,root,-)
@@ -190,8 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug 31 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.4-8
-- Rebuild for xulrunner
+* Mon Sep  6 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.5-1
+- Update to 0.4.5
+- Disable mozjs on fedora >= 15
 
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/sources b/sources
index 4f8b3d6..a669141 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17b1681a313c2bb161e7cd6c898728f5  libproxy-0.4.4.tar.gz
+3b1ef3886d6b8ca5425b9e4eca9856e3  libproxy-0.4.5.tar.gz