[libproxy] - Update to 0.4.7 svn20110412 - Add support for webkitgtk3 - Add support for xulrunner 2.0 - fix #68
Nicolas Chauvet
kwizart at fedoraproject.org
Tue Apr 12 15:37:05 UTC 2011
commit 77a37a0b3764efd282453721381c736af4768fa7
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Tue Apr 12 17:37:33 2011 +0200
- Update to 0.4.7 svn20110412
- Add support for webkitgtk3
- Add support for xulrunner 2.0
- fix #683015 - libproxy fails with autoconfiguration
- fix #683018 - libproxy needs BR: NetworkManager-glib-devel (f14)
- Manually fix libproxy-1.0.pc version field - #664781 / #674854
.gitignore | 1 +
libproxy-0.4.6-python_noarch.patch | 19 ---
libproxy-0.4.7-xul2.0.patch | 12 ++
libproxy-trunk.patch | 240 ------------------------------------
libproxy.spec | 63 ++++++++--
sources | 2 +-
6 files changed, 63 insertions(+), 274 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0647e6..312adbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
libproxy-0.4.4.tar.gz
/libproxy-0.4.5.tar.gz
/libproxy-0.4.6.tar.gz
+/libproxy-0.4.7svn20110412.tar.gz
diff --git a/libproxy-0.4.7-xul2.0.patch b/libproxy-0.4.7-xul2.0.patch
new file mode 100644
index 0000000..9f0f85f
--- /dev/null
+++ b/libproxy-0.4.7-xul2.0.patch
@@ -0,0 +1,12 @@
+diff -up libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk.xul libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk
+--- libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk.xul 2011-03-22 23:54:22.000000000 +0100
++++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-04-12 15:28:55.235341002 +0200
+@@ -11,7 +11,7 @@ elseif(NOT APPLE)
+ option(WITH_MOZJS "Search for MOZJS package" ON)
+ if (WITH_MOZJS)
+ foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
+- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12)
++ pkg_search_module(MOZJS ${MOZJSLIB} >=2.0 )
+ if(MOZJS_FOUND)
+ include_directories(${MOZJS_INCLUDE_DIRS})
+ link_directories(${MOZJS_LIBRARY_DIRS})
diff --git a/libproxy.spec b/libproxy.spec
index 96be16a..5eb59df 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -2,10 +2,13 @@
#0 to bootstrap libproxy circle dependencies - 1 normal case
%if 1
-%if 0%{?fedora} < 15
+%if 0%{?fedora} > 14
+%global gecko_version 2.0
+%global _with_webkitgtk3 1
+%else
+%global gecko_version 1.9.2
%global _with_webkit 1
%endif
-%global gecko_version 2.0
%global _with_mozjs 1
%global _with_gnome 1
%global _with_kde 1
@@ -13,21 +16,24 @@
%endif
%global _with_python 1
+%global svn svn20110412
+
Name: libproxy
-Version: 0.4.6
-Release: 5%{?dist}
+Version: 0.4.7
+Release: 0.1%{?svn}%{?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.6-python_noarch.patch
-Patch1: libproxy-trunk.patch
+Source0: http://libproxy.googlecode.com/files/libproxy-%{version}%{?svn}.tar.gz
+Patch0: libproxy-0.4.7-xul2.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_python:BuildRequires: python-devel}
+%if 0%{?fedora} > 14
BuildRequires: libmodman-devel >= 2.0.1
+%endif
BuildRequires: cmake >= 2.6.0
# gnome
@@ -48,6 +54,8 @@ BuildRequires: dbus-devel
}
# webkit (gtk)
%{?_with_webkit:BuildRequires: WebKit-gtk-devel}
+# webkit (gtk3)
+%{?_with_webkitgtk3:BuildRequires: webkitgtk3-devel}
# kde
%{?_with_kde:BuildRequires: kdelibs-devel}
@@ -60,6 +68,10 @@ Obsoletes: %{name}-mozjs < %{version}-%{release}
Provides: %{name}-webkit = %{version}-%{release}
Obsoletes: %{name}-webkit < %{version}-%{release}
}
+%{!?_with_webkitgtk3:
+Provides: %{name}-webkitgtk3 = %{version}-%{release}
+Obsoletes: %{name}-webkitgtk3 < %{version}-%{release}
+}
%description
@@ -149,6 +161,19 @@ The %{name}-webkit package contains the %{name} plugin for
webkit.
}
+%{?_with_webkitgtk3:
+%package webkitgtk3
+Summary: Plugin for %{name} and webkitgtk3
+Group: System Environment/Libraries
+Requires: %{name} = %{version}
+Provides: %{name}-pac = %{version}-%{release}
+
+%description webkitgtk3
+The %{name}-webkit package contains the %{name} plugin for
+webkitgtk3.
+}
+
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@@ -161,15 +186,17 @@ developing applications that use %{name}.
%prep
%setup -q
-%patch0 -p1 -b.pynoarch
-%patch1 -p1 -b .trunk
+%patch0 -p1 -b .xul2
+#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} \
-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
-DWITH_PERL=OFF \
+ %{?_with_webkitgtk3:-DWITH_WEBKIT3=ON}\
.
make VERBOSE=1 %{?_smp_mflags}
@@ -242,6 +269,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
}
+%{?_with_webkitgtk3:
+%files webkitgtk3
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
+}
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/proxy.h
@@ -251,11 +284,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Apr 2 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-5
-- Add support for xulrunner 2.0 from trunk
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.7-0.1svn20110412
+- Update to 0.4.7 svn20110412
+- Add support for webkitgtk3
+- Add support for xulrunner 2.0
+- fix #683015 - libproxy fails with autoconfiguration
+- fix #683018 - libproxy needs BR: NetworkManager-glib-devel (f14)
+- Manually fix libproxy-1.0.pc version field - #664781 / #674854
* Wed Nov 24 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-3
- Fix mozjs/webkit obsoletion - rhbz#656849
diff --git a/sources b/sources
index 98878a3..ffc1c56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-199c6b120baf1f7258a55f38d5ec74f5 libproxy-0.4.6.tar.gz
+a7e0856a6310a9666b5d27b0a4503cec libproxy-0.4.7svn20110412.tar.gz
More information about the scm-commits
mailing list