commit sitecopy for openSUSE:Factory
Hello community, here is the log from the commit of package sitecopy for openSUSE:Factory checked in at 2014-05-02 14:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sitecopy (Old) and /work/SRC/openSUSE:Factory/.sitecopy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sitecopy" Changes: -------- --- /work/SRC/openSUSE:Factory/sitecopy/sitecopy.changes 2011-09-23 12:46:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sitecopy.new/sitecopy.changes 2014-05-02 14:03:22.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 27 16:14:56 UTC 2014 - crrodriguez@opensuse.org + +- fix build with no SSLv2, caused by package using + bundled neon library, update supporting patch + (sitecopy-support-neon-0.29.diff) +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sitecopy.spec ++++++ --- /var/tmp/diff_new_pack.n2ugsZ/_old 2014-05-02 14:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.n2ugsZ/_new 2014-05-02 14:03:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sitecopy (Version 0.16.6) +# spec file for package sitecopy # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sitecopy -BuildRequires: fdupes libexpat-devel neon-devel openssl-devel pkgconfig +BuildRequires: fdupes +BuildRequires: neon-devel +BuildRequires: pkgconfig Summary: Local to Remote Website Synchronizer -Version: 0.16.6 -Release: 26 -Requires: %{name}-lang = %{version} License: GPL-2.0+ Group: Productivity/Networking/Web/Utilities +Version: 0.16.6 +Release: 0 +Requires: %{name}-lang = %{version} Url: http://www.manyfish.co.uk/sitecopy/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2 @@ -44,12 +44,11 @@ %prep %setup -q %patch0 -p1 +# Forcibly prevent use of bundled neon/expat/gettext sources. +rm -r lib/neon/*.[ch] intl/*.[ch] %build -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=%{_mandir} \ +%configure \ --with-expat \ --with-ssl make %{?jobs:-j%jobs} ++++++ sitecopy-support-neon-0.29.diff ++++++ --- /var/tmp/diff_new_pack.n2ugsZ/_old 2014-05-02 14:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.n2ugsZ/_new 2014-05-02 14:03:22.000000000 +0200 @@ -1,7 +1,5 @@ -Index: sitecopy-0.16.6/lib/neon/ne_openssl.c -=================================================================== ---- sitecopy-0.16.6.orig/lib/neon/ne_openssl.c 2008-02-06 12:27:38.000000000 +0100 -+++ sitecopy-0.16.6/lib/neon/ne_openssl.c 2010-09-06 14:33:36.278385141 +0200 +--- sitecopy-0.16.6.orig/lib/neon/ne_openssl.c ++++ sitecopy-0.16.6/lib/neon/ne_openssl.c @@ -615,6 +615,18 @@ void ne_ssl_context_destroy(ne_ssl_conte ne_free(ctx); } @@ -21,3 +19,23 @@ /* For internal use only. */ int ne__negotiate_ssl(ne_session *sess) { +--- sitecopy-0.16.6.orig/configure ++++ sitecopy-0.16.6/configure +@@ -8456,7 +8456,7 @@ fi + 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 27 28; do ++ for v in 24 25 26 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac +@@ -9256,7 +9256,7 @@ fi + 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 27 28; do ++ for v in 24 25 26 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de