Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit sitecopy
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Jan 2008 03:02:42 +0100
  • Message-id: <20080107020242.A21D0678335@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package sitecopy
checked in at Mon Jan 7 03:02:42 CET 2008.

--------
--- GNOME/sitecopy/sitecopy.changes 2007-08-08 18:58:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/sitecopy/sitecopy.changes 2008-01-04
14:05:15.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 4 14:03:21 CET 2008 - olh@xxxxxxx
+
+- do not use built-in neon
+
+-------------------------------------------------------------------

New:
----
sitecopy.neon.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sitecopy.spec ++++++
--- /var/tmp/diff_new_pack.w22265/_old 2008-01-07 03:02:10.000000000 +0100
+++ /var/tmp/diff_new_pack.w22265/_new 2008-01-07 03:02:10.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sitecopy (Version 0.16.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,13 +14,14 @@
BuildRequires: fdupes neon-devel openssl-devel pkgconfig
Summary: Local to Remote Website Synchronizer
Version: 0.16.3
-Release: 56
+Release: 79
Requires: %{name}-lang = %{version}
License: GPL v2 or later
Group: Productivity/Networking/Web/Utilities
-Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2
-URL: http://www.lyra.org/sitecopy
+Url: http://www.lyra.org/sitecopy
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2
+Patch0: sitecopy.neon.patch

%description
Sitecopy is useful for copying locally stored web sites to remote web
@@ -40,29 +41,23 @@
%lang_package
%prep
%setup -q
+%patch0 -p1

%build
-# vanilla sitecopy.
-rm -rf sitecopy
-mkdir sitecopy
-cd sitecopy
-CFLAGS="$RPM_OPT_FLAGS" ../configure \
+CFLAGS="$RPM_OPT_FLAGS" \
+./configure \
--prefix=/usr \
--mandir=%{_mandir} \
--with-expat \
--with-ssl
make %{?jobs:-j%jobs}
-cd ..

%install
OMG=`mktemp -u /tmp/$$.%{name}-install-tmp.XXXXXXXXXX`
rm -rf $RPM_BUILD_ROOT
-cd sitecopy
make DESTDIR=$RPM_BUILD_ROOT docdir=$OMG pkgdatadir=$OMG install MANLANGS=
rm -rf "$RPM_BUILD_ROOT$OMG"
-cd ..
%find_lang %name
-
%fdupes $RPM_BUILD_ROOT

%clean
@@ -79,6 +74,8 @@
%files lang -f %{name}.lang

%changelog
+* Fri Jan 04 2008 - olh@xxxxxxx
+- do not use built-in neon
* Wed Aug 08 2007 - maw@xxxxxxx
- Use %%fdupes
- Split off a -lang subpackage.

++++++ sitecopy.neon.patch ++++++
---
configure | 2 +-
configure.in | 2 +-
src/davdriver.c | 20 ++------------------
3 files changed, 4 insertions(+), 20 deletions(-)

--- a/configure
+++ b/configure
@@ -7910,7 +7910,7 @@ echo "$as_me:$LINENO: result: $ne_cv_lib
echo "${ECHO_T}$ne_cv_lib_neon" >&6
if test "$ne_cv_lib_neon" = "yes"; then
ne_cv_lib_neonver=no
- for v in 24 25 26; do
+ for v in 24 25 26 27 28; do
case $ne_libver in
0.$v.*) ne_cv_lib_neonver=yes ;;
esac
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,7 @@ if test "$sc_cv_gnu_fnmatch" = "no"; the
fi

# Support neon 0.24, 0.25, 0.26.
-NE_REQUIRE_VERSIONS([0], [24 25 26])
+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])

dnl But we don't use zlib or ACL support
NEON_WITHOUT_ZLIB
--- a/src/davdriver.c
+++ b/src/davdriver.c
@@ -62,9 +62,9 @@ struct fetch_context {
const char *root;
};

-#define ENABLE_PROGRESS do { ne_set_progress(sess, site_sock_progress_cb,
NULL); } while (0)
+#define ENABLE_PROGRESS

-#define DISABLE_PROGRESS do { ne_set_progress(sess, NULL, NULL); } while (0)
+#define DISABLE_PROGRESS

/* TODO:
* not really sure whether we should be using an enum here... what
@@ -140,21 +140,6 @@ proxy_auth_cb(void *userdata, const char
username, password);
}

-static void notify_cb(void *userdata, ne_conn_status status, const char *info)
-{
-
-#define MAP(a) case ne_conn_##a: fe_connection(fe_##a, info); break
-
- switch (status) {
- MAP(namelookup);
- MAP(connecting);
- MAP(connected);
- default:
- break;
- }
-
-#undef MAP
-}

static int h2s(ne_session *sess, int errcode)
{
@@ -235,7 +220,6 @@ static int init(void **session, struct s
}
}

- ne_set_status(sess, notify_cb, NULL);

if (site->http_limit) {
#if NE_VERSION_MINOR > 25

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages