From b730bf4669d086f184018c456cadf0c32a104b36292e0a7c2fb4a01026b7f86b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 25 Oct 2007 23:53:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=13 --- subversion.changes | 5 ++++ subversion.pedantic-headers.diff | 49 ++++++++++++++++++++++++++++++++ subversion.spec | 6 +++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 subversion.pedantic-headers.diff diff --git a/subversion.changes b/subversion.changes index a916b94..02136ba 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 25 09:57:02 CEST 2007 - dmueller@suse.de + +- fix subversion headers to be compileable with -pedantic + ------------------------------------------------------------------- Mon Oct 15 17:13:09 CEST 2007 - olh@suse.de diff --git a/subversion.pedantic-headers.diff b/subversion.pedantic-headers.diff new file mode 100644 index 0000000..698f139 --- /dev/null +++ b/subversion.pedantic-headers.diff @@ -0,0 +1,49 @@ +--- subversion/include/svn_types.h ++++ subversion/include/svn_types.h +@@ -257,7 +257,7 @@ typedef enum + in any files or subdirectories not already present; those + subdirectories' this_dir entries will have depth-infinity. + Equivalent to the pre-1.5 default update behavior. */ +- svn_depth_infinity = 3, ++ svn_depth_infinity = 3 + + } svn_depth_t; + +@@ -835,7 +835,7 @@ typedef enum + svn_rangelist_equal_inheritance, + + /* Inheritability of both ranges must be @c TRUE. */ +- svn_rangelist_only_inheritable, ++ svn_rangelist_only_inheritable + } svn_merge_range_inheritance_t; + + /** +--- subversion/include/svn_wc.h ++++ subversion/include/svn_wc.h +@@ -769,7 +769,7 @@ typedef enum svn_wc_notify_action_t + + /** A merge operation (to path) has begun. See @c merge_range in + @c svn_wc_notify_t. @since New in 1.5 */ +- svn_wc_notify_merge_begin, ++ svn_wc_notify_merge_begin + + } svn_wc_notify_action_t; + +@@ -1044,7 +1044,7 @@ typedef enum svn_wc_conflict_reason_t + typedef enum svn_wc_conflict_kind_t + { + svn_wc_conflict_kind_text, /* textual conflict (on a file) */ +- svn_wc_conflict_kind_property, /* property conflict (on a file or dir) */ ++ svn_wc_conflict_kind_property /* property conflict (on a file or dir) */ + + /* ### Add future kinds here that represent "tree" conflicts. */ + +@@ -1129,7 +1129,7 @@ typedef enum svn_wc_conflict_choice_t + svn_wc_conflict_choose_base, /* user chooses the original version */ + svn_wc_conflict_choose_theirs, /* user chooses incoming version */ + svn_wc_conflict_choose_mine, /* user chooses his/her own version */ +- svn_wc_conflict_choose_merged, /* user chooses the merged version */ ++ svn_wc_conflict_choose_merged /* user chooses the merged version */ + + } svn_wc_conflict_choice_t; + diff --git a/subversion.spec b/subversion.spec index fed52f3..40f3f77 100644 --- a/subversion.spec +++ b/subversion.spec @@ -14,7 +14,7 @@ Name: subversion BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libneon-devel openldap2-devel python-devel swig BuildRequires: sqlite-devel Version: 1.5.0 -Release: 1 +Release: 6 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -52,6 +52,7 @@ Patch32: subversion.fallback-to-ipv4.patch Patch33: subversion.header_wrappers.patch Patch34: subversion.allowed-neon.patch Patch35: subversion.java14.patch +Patch36: subversion.pedantic-headers.diff # %description @@ -139,6 +140,7 @@ esac %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 %build with_jdk=none @@ -389,6 +391,8 @@ rm -rf $RPM_BUILD_ROOT %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* %changelog +* Thu Oct 25 2007 - dmueller@suse.de +- fix subversion headers to be compileable with -pedantic * Mon Oct 15 2007 - olh@suse.de - update to 1.5.x branch, to allow build with new neon build also with sqlite-devel