Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at Wed Jun 8 16:22:53 CEST 2011.
-------- --- GNOME/libproxy/libproxy-plugins.changes 2011-02-15 20:17:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/libproxy/libproxy-plugins.changes 2011-06-07 12:48:24.000000000 +0200 @@ -1,0 +2,36 @@ +Mon Jun 6 21:51:45 UTC 2011 - [email protected] + +- Update to version 0.4.7: + + Support/require xulrunner 2.0+ + + Support linking againgst libwebkit-gtk3 (-DWITH_WEBKIT3=ON) + + Port to gsettings for gnome3. (-DWITH_GNOME3=ON[default]) + + Issues closed: + - #149: always test for the right python noarch module path + - #155: Cannot compile with Firefox 4 + - #156: libproxy should build against webkitgtk-3.0 + - #158: Won't compile w/ xulrunner 2.0 final + - #159: libproxy fails with autoconfiguration + "http://proxy.domain.com"; + - #131: GSettings-based GNOME plugin + - #150: SUSE sysconfig/proxy config support +- Drop patches included upstream: + + libproxy-sysconfig-support.patch + + libproxy-xul2.patch + + libproxy-backports.patch +- Package gnome3 module instead of gnome module, if favor_gtk2 is + not set (in the project metadata). +- Add gnome3 module to baselibs.conf and fixup the various + Supplements in baselibs.conf (pointed to the pre -config names). +- When building for gnome3 (favor_gtk2 = 0), add BuildRequires: + pkgconfig(gio-2.0) >= 2.26, pkgconfig(gobject-2.0) and + pkgconfig(webkitgtk-3.0) +- When building for gnome2, add BuildRequires: + pkgconfig(gconf-2.0), pkgconfig(gobject-2.0) and replace + libwebkit-devel with pkgconfig(webkit-1.0). + +------------------------------------------------------------------- +Tue Apr 19 00:10:03 CEST 2011 - [email protected] + +- Update baselibs.conf. + +------------------------------------------------------------------- --- GNOME/libproxy/libproxy.changes 2011-04-19 00:10:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/libproxy/libproxy.changes 2011-06-07 12:48:24.000000000 +0200 @@ -1,0 +2,31 @@ +Mon Jun 6 21:51:45 UTC 2011 - [email protected] + +- Update to version 0.4.7: + + Support/require xulrunner 2.0+ + + Support linking againgst libwebkit-gtk3 (-DWITH_WEBKIT3=ON) + + Port to gsettings for gnome3. (-DWITH_GNOME3=ON[default]) + + Issues closed: + - #149: always test for the right python noarch module path + - #155: Cannot compile with Firefox 4 + - #156: libproxy should build against webkitgtk-3.0 + - #158: Won't compile w/ xulrunner 2.0 final + - #159: libproxy fails with autoconfiguration + "http://proxy.domain.com"; + - #131: GSettings-based GNOME plugin + - #150: SUSE sysconfig/proxy config support +- Drop patches included upstream: + + libproxy-sysconfig-support.patch + + libproxy-xul2.patch + + libproxy-backports.patch +- Package gnome3 module instead of gnome module, if favor_gtk2 is + not set (in the project metadata). +- Add gnome3 module to baselibs.conf and fixup the various + Supplements in baselibs.conf (pointed to the pre -config names). +- When building for gnome3 (favor_gtk2 = 0), add BuildRequires: + pkgconfig(gio-2.0) >= 2.26, pkgconfig(gobject-2.0) and + pkgconfig(webkitgtk-3.0) +- When building for gnome2, add BuildRequires: + pkgconfig(gconf-2.0), pkgconfig(gobject-2.0) and replace + libwebkit-devel with pkgconfig(webkit-1.0). + +------------------------------------------------------------------- @@ -4 +35 @@ -- update baselibs.conf +- Update baselibs.conf. calling whatdependson for head-i586 Old: ---- libproxy-0.4.6.tar.bz2 libproxy-backports.patch libproxy-sysconfig-support.patch libproxy-xul2.patch New: ---- libproxy-0.4.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.v0U9nw/_old 2011-06-08 16:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.v0U9nw/_new 2011-06-08 16:19:18.000000000 +0200 @@ -42,8 +42,8 @@ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 -Release: 4 +Version: 0.4.7 +Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -53,12 +53,6 @@ # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM libproxy-sysconfig-support.patch bnc#655483 [email protected] -- Add /etc/sysconfig support. Also tracked at http://code.google.com/p/libproxy/issues/detail?id=150 -Patch0: libproxy-sysconfig-support.patch -# PATCH-FEATURE-UPSTREAM libproxy-xul2.patch [email protected] -- Add compatibility to build against xulrunner 2.0 -Patch1: libproxy-xul2.patch -# PATCH-FIX-UPSTREAM libproxy-backports.patch [email protected] -- Backport from upstream source: svn revs: 769,771,776,777,778,780,781,782 -Patch2: libproxy-backports.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -73,7 +67,15 @@ # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 -BuildRequires: libwebkit-devel +%if 0%{?favor_gtk2} +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(webkit-1.0) +%else +BuildRequires: pkgconfig(gio-2.0) >= 2.26 +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(webkitgtk-3.0) +%endif %if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel %else @@ -212,25 +214,44 @@ %else +%if 0%{?favor_gtk2} + %package -n libproxy1-config-gnome -License: GPLv2+ ; LGPLv2.1+ + Summary: Libproxy module for GNOME configuration +%else + +%package -n libproxy1-config-gnome3 +Summary: Libproxy module for GNOME3 configuration +%endif +License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} +%if 0%{?favor_gtk2} Supplements: packageand(libproxy1:gconf2) %else +Supplements: packageand(libproxy1:libgio-2_0-0) +%endif +%else Requires: libproxy1-pacrunner = %{version} %endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} +%if 0%{?favor_gtk2} + %description -n libproxy1-config-gnome + +%else + +%description -n libproxy1-config-gnome3 + +%endif A module to extend libproxy with capabilities to query GNOME about proxy settings. - %package -n libproxy1-config-kde4 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration @@ -299,9 +320,6 @@ %prep %setup -q -n %{_sourcename} mkdir build -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 %build cd build @@ -342,6 +360,13 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ %endif +%if 0%{?favor_gtk2} + -DWITH_WEBKIT3=OFF \ + -DWITH_GNOME3=OFF \ +%else + -DWITH_WEBKIT3=ON \ + -DWITH_GNOME3=ON \ +%endif .. %{__make} VERBOSE=1 @@ -445,10 +470,19 @@ %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde4.so +%if 0%{?favor_gtk2} + %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf +%else + +%files -n libproxy1-config-gnome3 +%defattr(-, root, root) +%{_libdir}/libproxy-%{version}/modules/config_gnome3.so +%{_libexecdir}/libproxy-%{version}/pxgsettings +%endif %files -n libproxy1-networkmanager %defattr(-, root, root) ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.v0U9nw/_old 2011-06-08 16:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.v0U9nw/_new 2011-06-08 16:19:18.000000000 +0200 @@ -42,8 +42,8 @@ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 -Release: 9 +Version: 0.4.7 +Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -53,12 +53,6 @@ # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM libproxy-sysconfig-support.patch bnc#655483 [email protected] -- Add /etc/sysconfig support. Also tracked at http://code.google.com/p/libproxy/issues/detail?id=150 -Patch0: libproxy-sysconfig-support.patch -# PATCH-FEATURE-UPSTREAM libproxy-xul2.patch [email protected] -- Add compatibility to build against xulrunner 2.0 -Patch1: libproxy-xul2.patch -# PATCH-FIX-UPSTREAM libproxy-backports.patch [email protected] -- Backport from upstream source: svn revs: 769,771,776,777,778,780,781,782 -Patch2: libproxy-backports.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -73,7 +67,15 @@ # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 -BuildRequires: libwebkit-devel +%if 0%{?favor_gtk2} +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(webkit-1.0) +%else +BuildRequires: pkgconfig(gio-2.0) >= 2.26 +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(webkitgtk-3.0) +%endif %if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel %else @@ -212,25 +214,44 @@ %else +%if 0%{?favor_gtk2} + %package -n libproxy1-config-gnome -License: GPLv2+ ; LGPLv2.1+ + Summary: Libproxy module for GNOME configuration +%else + +%package -n libproxy1-config-gnome3 +Summary: Libproxy module for GNOME3 configuration +%endif +License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} +%if 0%{?favor_gtk2} Supplements: packageand(libproxy1:gconf2) %else +Supplements: packageand(libproxy1:libgio-2_0-0) +%endif +%else Requires: libproxy1-pacrunner = %{version} %endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} +%if 0%{?favor_gtk2} + %description -n libproxy1-config-gnome + +%else + +%description -n libproxy1-config-gnome3 + +%endif A module to extend libproxy with capabilities to query GNOME about proxy settings. - %package -n libproxy1-config-kde4 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration @@ -299,9 +320,6 @@ %prep %setup -q -n %{_sourcename} mkdir build -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 %build cd build @@ -342,6 +360,13 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ %endif +%if 0%{?favor_gtk2} + -DWITH_WEBKIT3=OFF \ + -DWITH_GNOME3=OFF \ +%else + -DWITH_WEBKIT3=ON \ + -DWITH_GNOME3=ON \ +%endif .. %{__make} VERBOSE=1 @@ -445,10 +470,19 @@ %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde4.so +%if 0%{?favor_gtk2} + %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf +%else + +%files -n libproxy1-config-gnome3 +%defattr(-, root, root) +%{_libdir}/libproxy-%{version}/modules/config_gnome3.so +%{_libexecdir}/libproxy-%{version}/pxgsettings +%endif %files -n libproxy1-networkmanager %defattr(-, root, root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.v0U9nw/_old 2011-06-08 16:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.v0U9nw/_new 2011-06-08 16:19:18.000000000 +0200 @@ -1,11 +1,13 @@ libproxy1 libproxy1-config-gnome - supplements "packageand(libproxy1-<targettype>:libproxy1-gnome)" + supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome)" +libproxy1-config-gnome3 + supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome3)" libproxy1-config-kde4 - supplements "packageand(libproxy1-<targettype>:libproxy1-kde)" + supplements "packageand(libproxy1-<targettype>:libproxy1-config-kde)" libproxy1-pacrunner-mozjs - supplements "packageand(libproxy1-<targettype>:libproxy1-mozjs)" + supplements "packageand(libproxy1-<targettype>:libproxy1-config-mozjs)" libproxy1-networkmanager - supplements "packageand(libproxy1-<targettype>:libproxy1-networkmanager)" + supplements "packageand(libproxy1-<targettype>:libproxy1-config-networkmanager)" libproxy1-pacrunner-webkit - supplements "packageand(libproxy1-<targettype>:libproxy1-webkit)" + supplements "packageand(libproxy1-<targettype>:libproxy1-config-webkit)" ++++++ libproxy-0.4.6.tar.bz2 -> libproxy-0.4.7.tar.bz2 ++++++ ++++ 1656 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
