diff --git a/subversion-1.14.3.tar.bz2 b/subversion-1.14.4.tar.bz2 similarity index 52% rename from subversion-1.14.3.tar.bz2 rename to subversion-1.14.4.tar.bz2 index 8c10b5f41181aa241a5470d81d1f7073365ea7d8..4eebb0734fd2a2f534a97c95c499b432c7ac451a 100644 Binary files a/subversion-1.14.3.tar.bz2 and b/subversion-1.14.4.tar.bz2 differ diff --git a/subversion-underlinking.patch b/subversion-underlinking.patch new file mode 100644 index 0000000000000000000000000000000000000000..37be9b5f30ea0c272e1b696b898fbf22ea174404 --- /dev/null +++ b/subversion-underlinking.patch @@ -0,0 +1,64 @@ +diff --git a/build.conf b/build.conf +index 1f0d2d8..f2847c2 100644 +--- a/build.conf ++++ b/build.conf +@@ -204,7 +204,7 @@ manpages = subversion/svnsync/svnsync.1 + description = Subversion Revision Extractor + type = exe + path = subversion/svnversion +-libs = libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_wc libsvn_subr libsvn_diff apriconv apr + install = bin + manpages = subversion/svnversion/svnversion.1 + +@@ -1219,7 +1219,7 @@ type = exe + path = subversion/tests/libsvn_client + sources = mtcc-test.c + install = test +-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr ++libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr libsvn_diff apriconv apr + + [conflicts-test] + description = Test libsvn_client conflict resolver +@@ -1270,7 +1270,7 @@ type = exe + path = subversion/tests/libsvn_ra_local + sources = ra-local-test.c + install = test +-libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr ++libs = libsvn_test libsvn_repos libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr + apriconv apr + + # ---------------------------------------------------------------------------- +diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in +index 3b36901..ca6e83a 100644 +--- a/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -88,11 +88,10 @@ my %config = ( + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {"-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `$swig -perl -ldflags`)], +- LDFLAGS => join(' ', (map {"-L$_"} @ldpaths), '@LDFLAGS@ @SWIG_PL_LINK@'), +- LDDLFLAGS => join(' ', (map {"-L$_"} @ldpaths), +- '@LDFLAGS@ @SWIG_PL_LINK@', $Config{lddlflags}), ++ @ldmodules, '-lsvn_swig_perl-1')], ++ LDFLAGS => join(' ', '@SWIG_PL_LINK@', (map {"-L$_"} @ldpaths)), ++ LDDLFLAGS => join(' ', '@SWIG_PL_LINK@', (map {"-L$_"} @ldpaths), ++ $Config{lddlflags}), + test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } + ); + +diff --git a/Makefile.in b/Makefile.in +index 48a14bf..271c0ae 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -897,7 +897,7 @@ swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile + fi; \ + done; \ + fi +- cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" ++ cd $(SWIG_PL_DIR)/native; $(MAKE) + + check-swig-pl: swig-pl swig-pl-lib + cd $(SWIG_PL_DIR)/native; $(MAKE) test diff --git a/subversion.spec b/subversion.spec index 0fcb56c733b7bc58cb6ecb71eb0d0942010c8088..9cfde71da08bb73e968f4e3d4a501b8c67d4a479 100644 --- a/subversion.spec +++ b/subversion.spec @@ -12,9 +12,9 @@ Summary: Subversion, a version control system. Name: subversion -Version: 1.14.3 -Release: 5 -License: ASL 2.0 +Version: 1.14.4 +Release: 1 +License: Apache-2.0 URL: https://subversion.apache.org/ Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 @@ -25,24 +25,23 @@ Patch2: subversion-1.14.0-soversion.patch Patch3: subversion-1.8.0-rubybind.patch Patch4: subversion-1.8.5-swigplWall.patch Patch5: subversion-1.14.3-fix-build-errors.patch -%if "%{?toolchain}" == "clang" -Patch6: support-clang-build.patch -%endif +Patch6: subversion-underlinking.patch +Patch7: support-clang-build.patch BuildRequires: autoconf libtool texinfo which swig gettext apr-devel apr-util-devel libserf-devel cyrus-sasl-devel sqlite-devel file-devel utf8proc-devel lz4-devel apr-util-openssl dbus-devel, libsecret-devel httpd-devel Requires: httpd -Provides: svn -Provides: %{name}-libs -Provides: %{name}-gnome -Provides: mod_dav_svn -Provides: %{name}-tools +Provides: svn = %{version}-%{release} +Provides: %{name}-libs = %{version}-%{release} +Provides: %{name}-gnome = %{version}-%{release} +Provides: mod_dav_svn = %{version}-%{release} +Provides: %{name}-tools = %{version}-%{release} -Obsoletes: svn -Obsoletes: %{name}-libs -Obsoletes: %{name}-gnome -Obsoletes: mod_dav_svn -Obsoletes: %{name}-tools +Obsoletes: svn < %{version}-%{release} +Obsoletes: %{name}-libs < %{version}-%{release} +Obsoletes: %{name}-gnome < %{version}-%{release} +Obsoletes: mod_dav_svn < %{version}-%{release} +Obsoletes: %{name}-tools < %{version}-%{release} %define swigdirs swig_pydir=%{svn_python_sitearch}/libsvn swig_pydir_extra=%{svn_python_sitearch}/svn @@ -64,6 +63,8 @@ Development package for subversion. Provides: %{name}-python = %{version}-%{release} Provides: python3-%{name} = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Conflicts: subversion < 1.14.4 BuildRequires: python3-devel py3c-devel Summary: python3 bindings to the subversion libraries @@ -73,7 +74,7 @@ python3 bindings to the subversion libraries %package -n perl-%{name} Summary: perl bindings to the subversion libraries Provides: %{name}-perl = %{version}-%{release} -Obsoletes: %{name}-perl +Obsoletes: %{name}-perl < %{version}-%{release} BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker) perl(Test::More), perl(ExtUtils::Embed) Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") Requires: subversion%{?_isa} = %{version}-%{release} @@ -85,9 +86,9 @@ perl bindings to the subversion libraries %package -n java-%{name} Summary: java bindings to the subversion libraries Provides: %{name}-java = %{version}-%{release} -Obsoletes: %{name}-java +Obsoletes: %{name}-java < %{version}-%{release} Provides: %{name}-javahl = %{version}-%{release} -Obsoletes: %{name}-javahl +Obsoletes: %{name}-javahl < %{version}-%{release} Requires: subversion = %{version}-%{release} BuildRequires: java-devel-openjdk zip, unzip junit BuildArch: noarch @@ -99,7 +100,7 @@ java bindings to the subversion libraries %package -n ruby-%{name} Summary: Ruby bindings to the Subversion libraries Provides: %{name}-ruby = %{version}-%{release} -Obsoletes: %{name}-ruby +Obsoletes: %{name}-ruby < %{version}-%{release} BuildRequires: ruby-devel ruby rubygem(test-unit) Requires: subversion%{?_isa} = %{version}-%{release} @@ -127,7 +128,10 @@ export CC=%{__cc} CXX=%{__cxx} JAVA_HOME=%{jdk_path} %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --disable-debug \ - --with-swig --with-serf=%{_prefix} \ + --with-swig-perl \ + --with-swig-python \ + --with-swig-ruby \ + --with-serf=%{_prefix} \ --with-ruby-sitedir=%{ruby_vendorarchdir} \ --with-ruby-test-verbose=verbose \ --with-apxs=%{_httpd_apxs} --disable-mod-activation \ @@ -141,15 +145,16 @@ export CC=%{__cc} CXX=%{__cxx} JAVA_HOME=%{jdk_path} %endif --without-berkeley-db \ || (cat config.log; exit 1) -make %{?_smp_mflags} all tools -make %{?_smp_mflags} swig-py swig-py-lib %{swigdirs} -make %{?_smp_mflags} swig-pl swig-pl-lib swig-rb swig-rb-lib +%make_build all tools +%make_build swig-py swig-py-lib %{swigdirs} LIBS="-lpython%{python3_version}" +%make_build swig-pl swig-pl-lib LIBS="-lperl" +%make_build swig-rb swig-rb-lib LIBS="-lruby" %if %{with java} -make %{?_smp_mflags} javahl +make javahl %endif %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT make pure_vendor_install -C subversion/bindings/swig/perl/native \ @@ -250,6 +255,7 @@ make check-javahl %{_datadir}/bash-completion/ %dir %{_sysconfdir}/subversion %{_libdir}/libsvn*.so.* +%exclude %{_libdir}/libsvn_swig_py* %exclude %{_libdir}/libsvn_swig_perl* %exclude %{_libdir}/libsvn_swig_ruby* %if %{with java} @@ -259,6 +265,7 @@ make check-javahl %{_libdir}/httpd/modules/mod_*.so %files -n python3-subversion +%{_libdir}/libsvn_swig_py* %{python3_sitearch}/svn %{python3_sitearch}/libsvn @@ -267,7 +274,6 @@ make check-javahl %{_libdir}/libsvn*.*a %{_libdir}/libsvn*.so %{_datadir}/pkgconfig/*.pc -%exclude %{_libdir}/libsvn_swig_perl* %if %{with java} %exclude %{_libdir}/libsvnjavahl-*.so %endif @@ -292,6 +298,9 @@ make check-javahl %endif %changelog +* Wed Oct 09 2024 Funda Wang - 1.14.4-1 +- update to 1.14.4 + * Mon Jul 15 2024 Funda Wang - 1.14.3-5 - Disable automatic .la file removal diff --git a/subversion.yaml b/subversion.yaml index 0585b2597960e1cf02c172beeef6ffebc44cb9e5..a5b00c5c92b14a4ca9e497216f726f96d7a59b1d 100644 --- a/subversion.yaml +++ b/subversion.yaml @@ -1,4 +1,4 @@ version_control: svn src_repo: "https://svn.apache.org/repos/asf/subversion/" tag_prefix: -seperator: +separator: