diff --git a/.cvsignore b/.cvsignore index bfde973..7618dd0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libproxy-0.2.3.tar.gz +libproxy-0.3.0.tar.gz diff --git a/import.log b/import.log index 2fd8fd7..312f5e2 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ libproxy-0_2_3-8_fc10:HEAD:libproxy-0.2.3-8.fc10.src.rpm:1232723319 +libproxy-0_3_0-1_fc12:HEAD:libproxy-0.3.0-1.fc12.src.rpm:1255986871 diff --git a/libproxy-0.2.3-dbus.patch b/libproxy-0.2.3-dbus.patch deleted file mode 100644 index 2b29918..0000000 --- a/libproxy-0.2.3-dbus.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up libproxy-0.2.3/configure.dbus libproxy-0.2.3/configure ---- libproxy-0.2.3/configure.dbus 2008-07-11 12:13:12.000000000 +0200 -+++ libproxy-0.2.3/configure 2008-07-11 12:13:24.000000000 +0200 -@@ -20408,12 +20408,12 @@ if test -n "$NetworkManager_CFLAGS"; the - pkg_cv_NetworkManager_CFLAGS="$NetworkManager_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5 -- ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager" 2>/dev/null` -+ pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager dbus-1" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -20424,12 +20424,12 @@ if test -n "$NetworkManager_LIBS"; then - pkg_cv_NetworkManager_LIBS="$NetworkManager_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5 -- ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager" 2>/dev/null` -+ pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager dbus-1" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -20447,9 +20447,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager" 2>&1` -+ NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager dbus-1" 2>&1` - else -- NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager" 2>&1` -+ NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager dbus-1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$NetworkManager_PKG_ERRORS" >&5 -diff -up libproxy-0.2.3/configure.ac.dbus libproxy-0.2.3/configure.ac ---- libproxy-0.2.3/configure.ac.dbus 2008-07-11 12:12:43.000000000 +0200 -+++ libproxy-0.2.3/configure.ac 2008-07-11 12:12:58.000000000 +0200 -@@ -19,7 +19,7 @@ PKG_CHECK_MODULES(webkit, webkit-1.0, ha - PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])]) --PKG_CHECK_MODULES(NetworkManager, NetworkManager, -+PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, - have_networkmanager=yes, have_networkmanager=no) - - # Environmental Variable diff --git a/libproxy.spec b/libproxy.spec index 22d9918..481bb75 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -3,15 +3,14 @@ %define gecko_version 1.9.1 Name: libproxy -Version: 0.2.3 -Release: 12%{?dist} +Version: 0.3.0 +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.2.3-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -113,9 +112,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .dbus -touch -r configure.dbus configure -touch -r configure.ac.dbus configure.ac + %build @@ -181,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 0.3.0-1 +- Update to 0.3.0 + * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2.3-12 - Remove Requirement of %%{name}-pac virtual provides from the main package - #524043 diff --git a/sources b/sources index 4a491f6..c578713 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86b635e1eb2d665cfbef4c6134fe6604 libproxy-0.2.3.tar.gz +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz