Author: qboosh Date: Fri Jun 10 12:57:04 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.4.7 - updated pac-modules patch - removed obsolete pythondir patch - use system libmodman - switched gnome module to GNOME 3, webkit pacrunner to gtk-webkit3
---- Files affected: packages/libproxy: libproxy-pac-modules.patch (1.1 -> 1.2) , libproxy.spec (1.12 -> 1.13) , libproxy-pythondir.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/libproxy/libproxy-pac-modules.patch diff -u packages/libproxy/libproxy-pac-modules.patch:1.1 packages/libproxy/libproxy-pac-modules.patch:1.2 --- packages/libproxy/libproxy-pac-modules.patch:1.1 Mon Nov 15 22:16:24 2010 +++ packages/libproxy/libproxy-pac-modules.patch Fri Jun 10 14:56:59 2011 @@ -1,12 +1,12 @@ Always build pacrunners as separate modules, not libproxy builtins ---- libproxy-0.4.6/libproxy/cmake/modules.cmk.orig 2010-09-01 22:23:34.000000000 +0200 -+++ libproxy-0.4.6/libproxy/cmake/modules.cmk 2010-11-15 08:54:24.659099937 +0100 -@@ -17,10 +17,7 @@ +--- libproxy-0.4.7/libproxy/cmake/modules.cmk.orig 2011-06-06 23:44:37.000000000 +0200 ++++ libproxy-0.4.7/libproxy/cmake/modules.cmk 2011-06-10 14:25:54.438874361 +0200 +@@ -19,10 +19,7 @@ include(cmake/modules/pacrunner_webkit.cmk) # Build the pacrunner into libproxy unless we are building for multiple engines -set(BIPR 1) --if(MOZJS_FOUND AND WEBKIT_FOUND) +-if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) - set(BIPR 0) -endif() +set(BIPR 0) ================================================================ Index: packages/libproxy/libproxy.spec diff -u packages/libproxy/libproxy.spec:1.12 packages/libproxy/libproxy.spec:1.13 --- packages/libproxy/libproxy.spec:1.12 Sat Feb 12 14:33:38 2011 +++ packages/libproxy/libproxy.spec Fri Jun 10 14:56:59 2011 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +# TODO: libnatus-based pacrunner # # Conditional build: %bcond_without kde # KDE4 plugin @@ -10,22 +11,22 @@ Summary: Library for automatic proxy configuration management Summary(pl.UTF-8): Biblioteka do automatycznego zarządzania konfiguracją proxy Name: libproxy -Version: 0.4.6 +Version: 0.4.7 Release: 1 License: LGPL v2.1+ Group: Libraries #Source0Download: http://code.google.com/p/libproxy/downloads/list Source0: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.gz -# Source0-md5: 199c6b120baf1f7258a55f38d5ec74f5 +# Source0-md5: 509e03a488a61cd62bfbaf3ab6a2a7a5 Patch0: %{name}-pac-modules.patch -Patch1: %{name}-pythondir.patch URL: http://code.google.com/p/libproxy/ -BuildRequires: GConf2-devel >= 2.0 BuildRequires: NetworkManager-devel %{?with_kde:BuildRequires: automoc4} BuildRequires: cmake >= 2.6 -%{?with_webkit:BuildRequires: gtk-webkit-devel} +BuildRequires: glib2-devel >= 1:2.26 +%{?with_webkit:BuildRequires: gtk-webkit3-devel} %{?with_kde:BuildRequires: kde4-kdelibs-devel} +BuildRequires: libmodman-devel >= 2 BuildRequires: libstdc++-devel BuildRequires: mono-csharp BuildRequires: perl-devel >= 1:5.8.0 @@ -143,6 +144,7 @@ Summary(pl.UTF-8): Wtyczka GNOME dla libproxy Group: Libraries Requires: %{name} = %{version}-%{release} +Requires: glib2 >= 1:2.26 %description gnome GNOME (GConf) configuration plugin for libproxy. @@ -189,26 +191,20 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build install -d build cd build %cmake .. \ - -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ - -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ -DLIB_INSTALL_DIR=%{_libdir} \ -DLIBEXEC_INSTALL_DIR=%{_libdir}/libproxy \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 \ -%endif + -DFORCE_SYSTEM_LIBMODMAN=ON \ -DPERL_VENDORINSTALL=ON \ -DWITH_DOTNET=ON \ %{!?with_xulrunner:-DWITH_MOZJS=OFF} \ -DWITH_VALA=ON \ - %{!?with_webkit:-DWITH_WEBKIT=OFF} + %{!?with_webkit:-DWITH_WEBKIT=OFF} \ + %{?with_webkit:-DWITH_WEBKIT3=ON} %{__make} @@ -232,18 +228,15 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/proxy -%attr(755,root,root) %{_libdir}/libmodman.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libmodman.so.1 %attr(755,root,root) %{_libdir}/libproxy.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libproxy.so.1 %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{version} -%attr(755,root,root) %{_libdir}/%{name}/pxgconf +%attr(755,root,root) %{_libdir}/%{name}/pxgsettings %dir %{_libdir}/%{name}/%{version}/modules %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libmodman.so %attr(755,root,root) %{_libdir}/libproxy.so %{_includedir}/proxy.h %{_pkgconfigdir}/libproxy-1.0.pc @@ -279,7 +272,7 @@ %files gnome %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_gnome.so +%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_gnome3.so %if %{with kde} %files kde @@ -305,6 +298,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2011/06/10 12:56:59 qboosh +- updated to 0.4.7 +- updated pac-modules patch +- removed obsolete pythondir patch +- use system libmodman +- switched gnome module to GNOME 3, webkit pacrunner to gtk-webkit3 + Revision 1.12 2011/02/12 13:33:38 sls - added BR for kde module ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libproxy/libproxy-pac-modules.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libproxy/libproxy.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
