X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=subversion.spec;h=3e4d31cb18e357bb4ffec81d573fe50f4d5a0ade;hb=c0da073eda682d2ec67cb8f51c1ca7dead11a91e;hp=65419ca192dba5711ab3d6fb7adfefcfb48a4503;hpb=e2c40ca2311c0a72b0c52c7ef7c52fda6643d287;p=packages%2Fsubversion.git diff --git a/subversion.spec b/subversion.spec index 65419ca..3e4d31c 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,25 +1,30 @@ # # Conditional build: %bcond_with net_client_only # build only net client -%bcond_without neon # use serf instead of neon %bcond_without swig # disable bindings generation with Swig %bcond_without python # build without Python bindings (broken) %bcond_without csvn # build Python csvn bindings %bcond_without perl # build without Perl bindings -%bcond_with ruby # build without Ruby bindings +%bcond_without ruby # build without Ruby bindings %bcond_without apache # build without Apache support (webdav, etc) -%bcond_without javahl # build without javahl support (Java high-level bindings) -%bcond_without tests # don't perform "make check" +%bcond_without java # build without javahl support (Java high-level bindings) +%bcond_with tests # don't perform "make check" %bcond_without kwallet # build without kde4 wallet support -%bcond_without kde # build without kde4 support (alias for kwallet) +%bcond_without kde # build without kde4 support (alias for kwallet) %bcond_without gnome # build without gnome keyring support -%bcond_without db # disable Subversion Berkeley DB based filesystem library +%bcond_without db # disable Subversion Berkeley DB based filesystem library +%bcond_with db6 # allow BDB6 (not tested by upstream, released on AGPL) + +# for AC: --without csvn,gnome,java,kde,ruby %if %{with net_client_only} %undefine with_apache %undefine with_db %undefine with_swig -%undefine with_javahl +%undefine with_java +%undefine with_csvn +%undefine with_gnome +%undefine with_kde %endif %if %{without swig} @@ -40,23 +45,17 @@ %define pdir SVN %define pnam _Core -%if %{with neon} -%define webdavlib neon -%else -%define webdavlib serf -%endif %{?with_perl:%include /usr/lib/rpm/macros.perl} Summary: A Concurrent Versioning system similar to but better than CVS Summary(pl.UTF-8): System kontroli wersji podobny, ale lepszy, niż CVS Summary(pt_BR.UTF-8): Sistema de versionamento concorrente Name: subversion -Version: 1.7.0 -Release: 0.1 -License: Apache/BSD-like +Version: 1.9.3 +Release: 2 +License: Apache v2.0 Group: Development/Version Control -#Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2 -Source0: http://www.idg.pl/mirrors/apache/subversion/subversion-1.7.0-rc4.tar.bz2 -# Source0-md5: f892a9835a474840314cfedc4c6fa709 +Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 +# Source0-md5: 243036eb28b50ce517fc228eb3250add Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init @@ -69,57 +68,57 @@ Patch0: %{name}-home_etc.patch Patch1: %{name}-DESTDIR.patch Patch2: %{name}-ruby-datadir-path.patch Patch3: %{name}-tests.patch +Patch4: x32-libdir.patch +Patch5: %{name}-swig_py.patch URL: http://subversion.apache.org/ -%{?with_apache:BuildRequires: apache-devel >= 2.2.0-8} -BuildRequires: autoconf +%{?with_apache:BuildRequires: apache-devel >= 2.4.14} +BuildRequires: apr-devel >= 1:1.3 +BuildRequires: apr-util-devel >= 1:1.3 +BuildRequires: autoconf >= 2.59 BuildRequires: automake +BuildRequires: bison +BuildRequires: cyrus-sasl-devel +%if %{with kwallet} || %{with gnome} +BuildRequires: dbus-devel +%endif +%{!?with_db6:BuildRequires: db-devel < 6} BuildRequires: db-devel >= 4.1.25 -BuildRequires: libtool -BuildRequires: rpmbuild(macros) >= 1.583 +BuildRequires: expat-devel +BuildRequires: gettext-tools +%{?with_gnome:BuildRequires: glib2-devel >= 2.0} +%{?with_kwallet:BuildRequires: kde4-kdelibs-devel} +%{?with_gnome:BuildRequires: libgnome-keyring-devel} +BuildRequires: libmagic-devel +BuildRequires: libtool >= 1.4-9 +BuildRequires: pkgconfig +%{?with_csvn:BuildRequires: python-ctypesgen} +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.656 +BuildRequires: sed >= 4.0 +BuildRequires: serf-devel >= 1.3.4 +BuildRequires: sqlite3-devel >= 3.7.12 +BuildRequires: texinfo +BuildRequires: which +%if %{with java} +BuildRequires: jdk >= 1.5 +BuildRequires: libstdc++-devel +%endif %if %{with perl} BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: swig-perl >= 1.3.24 %endif -%if %{with csvn} -BuildRequires: python-ctypesgen -%endif %if %{with python} BuildRequires: python-devel >= 1:2.4 BuildRequires: swig-python >= 1.3.24 %endif %if %{with ruby} -BuildRequires: ruby-devel >= 1:1.8 -BuildRequires: ruby-devel < 1:1.9 +BuildRequires: rpm-rubyprov +BuildRequires: ruby-devel >= 1:1.8.2 +BuildRequires: ruby-irb BuildRequires: ruby-rubygems BuildRequires: swig-ruby >= 1.3.24 %endif -%if %{with javahl} -BuildRequires: jdk -BuildRequires: libstdc++-devel -%endif -BuildRequires: apr-devel >= 1:1.0.0 -BuildRequires: apr-util-devel >= 1:1.2.8-3 -BuildRequires: autoconf >= 2.59 -BuildRequires: bison -BuildRequires: cyrus-sasl-devel -BuildRequires: expat-devel -BuildRequires: gettext-devel -%{?with_kwallet:BuildRequires: kde4-kdelibs-devel} -%{?with_gnome:BuildRequires: libgnome-keyring-devel} -BuildRequires: libtool >= 1.4-9 -BuildRequires: pkgconfig -BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.559 -BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.6.11 -BuildRequires: texinfo -BuildRequires: which -%if %{with neon} -BuildRequires: neon-devel >= 0.26.0 -%else -BuildRequires: serf-devel -%endif Requires: %{name}-libs = %{version}-%{release} %requires_ge sqlite3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -128,7 +127,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d %define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) -%define skip_post_check_so libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.* +%define skip_post_check_so libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.* libsvn_fs_x-1.so.* %description The goal of the Subversion project is to build a version control @@ -176,7 +175,9 @@ System) na comunidade opensource, fornecendo grandes melhorias. Summary: Subversion libraries and modules Summary(pl.UTF-8): Biblioteka subversion oraz ładowalne moduły Group: Libraries -%{?with_neon:Requires: neon >= 0.26.0} +Requires: apr >= 1:1.3 +Requires: apr-util >= 1:1.3 +Requires: serf >= 1.3.4 Obsoletes: libsubversion0 %description libs @@ -191,8 +192,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe i dokumetacja do subversion Summary(pt_BR.UTF-8): Arquivos de desenvolvimento para o Subversion Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: apr-util-devel >= 1:1.0.0 -%{?with_neon:Requires: neon-devel >= 0.26.0} +Requires: apr-util-devel >= 1:1.3 +Requires: serf-devel >= 1.3.4 Obsoletes: libsubversion0-devel %description devel @@ -251,8 +252,8 @@ Summary: Subversion tools and scripts Summary(pl.UTF-8): Narzędzia oraz skrypty dla subversion Summary(pt_BR.UTF-8): Módulos python para acessar os recursos do Subversion Group: Applications -%pyrequires_eq python Requires: %{name} = %{version}-%{release} +Requires: python Requires: python-subversion = %{version} %description tools @@ -268,6 +269,9 @@ Group: Applications/Shells Requires: %{name} = %{version}-%{release} Requires: bash-completion Conflicts: %{name}-tools <= 1.1.0-0.rc6.1 +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n bash-completion-subversion Bash completion for subversion. @@ -299,8 +303,8 @@ Summary: Subversion Python bindings Summary(pl.UTF-8): Dowiązania do Subversion dla Pythona Summary(pt_BR.UTF-8): Módulos Python para acessar os recursos do Subversion Group: Development/Languages/Python -%pyrequires_eq python Requires: %{name}-libs = %{version}-%{release} +Requires: python Obsoletes: subversion-python %description -n python-subversion @@ -317,8 +321,8 @@ Summary: CTypes Subversion Python bindings Summary(pl.UTF-8): Dowiązania do Subversion dla Pythona Summary(pt_BR.UTF-8): Módulos Python para acessar os recursos do Subversion Group: Development/Languages/Python -%pyrequires_eq python Requires: %{name}-libs = %{version}-%{release} +Requires: python %description -n python-csvn Subversion CTypes Python bindings. @@ -365,7 +369,7 @@ Módulos Ruby para acessar os recursos do Subversion. %package -n apache-mod_dav_svn Summary: Apache module: Subversion Server -Summary(pl.UTF-8): Moduł apache: Serwer Subversion +Summary(pl.UTF-8): Moduł Apache'a: serwer Subversion Group: Networking/Daemons Requires: %{name} = %{version}-%{release} Requires: apache(modules-api) = %apache_modules_api @@ -375,12 +379,13 @@ Requires: apache-mod_dav Apache module: Subversion Server. %description -n apache-mod_dav_svn -l pl.UTF-8 -Moduł apache: Serwer Subversion. +Moduł Apache'a: serwer Subversion. %package -n apache-mod_authz_svn Summary: Apache module: Subversion Server - path-based authorization -Summary(pl.UTF-8): Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion +Summary(pl.UTF-8): Moduł Apache'a: autoryzacja na podstawie ścieżki dla serwera Subversion Group: Networking/Daemons +Requires: %{name}-libs = %{version}-%{release} Requires: apache(modules-api) = %apache_modules_api Requires: apache-mod_dav_svn = %{version}-%{release} @@ -388,12 +393,28 @@ Requires: apache-mod_dav_svn = %{version}-%{release} Apache module: Subversion Server - path-based authorization. %description -n apache-mod_authz_svn -l pl.UTF-8 -Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion. +Moduł Apache'a: autoryzacja na podstawie ścieżki dla serwera +Subversion. + +%package -n apache-mod_dontdothat_svn +Summary: Apache module: Allows you to block specific svn requests +Summary(pl.UTF-8): Moduł Apache'a pozwalający na blokowanie pewnych zapytań svn +Group: Networking/Daemons +Requires: %{name}-libs = %{version}-%{release} +Requires: apache(modules-api) = %apache_modules_api +Requires: apache-mod_dav_svn = %{version}-%{release} + +%description -n apache-mod_dontdothat_svn +Apache module: Allows you to block specific svn requests. + +%description -n apache-mod_dontdothat_svn -l pl.UTF-8 +Moduł Apache'a pozwalający na blokowanie pewnych zapytań svn. %package -n gnome-keyring-subversion Summary: GNOME Keyring authentication provider for Subversion Summary(pl.UTF-8): Moduł uwierzytelniający GNOME Keyring dla Subversion Group: X11/Applications +Requires: %{name}-libs = %{version}-%{release} %description -n gnome-keyring-subversion Authentication provider module for Subversion which allows SVN client @@ -407,6 +428,7 @@ uwierzytelniać się przy użyciu mechanizmu GNOME Keyring. Summary: KDE Wallet authentication provider for Subversion Summary(pl.UTF-8): Moduł uwierzytelniający dla Subversion wykorzystujący Portfel KDE Group: X11/Applications +Requires: %{name}-libs = %{version}-%{release} %description -n kde4-kwallet-subversion Authentication provider module for Subversion which allows SVN client @@ -417,17 +439,16 @@ Moduł uwierzytelniający dla Subversion pozwalający klientom SVN uwierzytelniać się przy użyciu Portfela KDE. %prep -%setup -q -n %{name}-%{version}-rc4 +%setup -q %patch0 -p0 %patch1 -p1 %patch2 -p0 %patch3 -p1 +%patch4 -p1 +%patch5 -p0 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4 -# serf.m4 macro is broken and ignores --without serf -%{?with_neon:sed -i -e 's#serf_found="yes"#serf_found="no"#g' build/ac-macros/serf.m4} - %build # disabled regeneration - subversion 1.6.13 is not ready for swig 2.0.x #%{__rm} subversion/bindings/swig/proxy/*.swg @@ -441,10 +462,12 @@ chmod +x ./autogen.sh && ./autogen.sh --disable-mod-activation \ %if %{with db} --with-berkeley-db="db.h:%{_includedir}:%{_libdir}:db" \ + %{?with_db6:--enable-bdb6} \ %else --without-berkeley-db \ %endif %if %{with apache} + --with-apache-libexecdir="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ --with-apxs=%{_sbindir}/apxs \ %else --without-apxs \ @@ -452,27 +475,24 @@ chmod +x ./autogen.sh && ./autogen.sh %if %{without swig} --without-swig \ %endif -%if %{without ruby} +%if %{with ruby} + svn_cv_ruby_sitedir_libsuffix="" \ + svn_cv_ruby_sitedir_archsuffix="" \ + --with-ruby-sitedir=%{ruby_vendorarchdir} \ +%else ac_cv_path_RUBY=none \ %endif %if %{with csvn} --with-ctypesgen=%{_bindir}/ctypesgen.py \ %endif -%if %{with javahl} +%if %{with java} --enable-javahl \ --with-jdk="%{java_home}" \ --without-jikes \ %else --disable-javahl \ %endif -%if %{with neon} - --without-serf \ - --with-neon=%{_prefix} \ - --disable-neon-version-check \ -%else --with-serf=%{_prefix} \ - --without-neon \ -%endif --with-apr=%{_bindir}/apr-1-config \ --with-apr-util=%{_bindir}/apu-1-config \ %if %{with kwallet} @@ -484,6 +504,8 @@ chmod +x ./autogen.sh && ./autogen.sh %{__make} -j1 +%{__make} tools + %if %{with csvn} # Python ctypes bindings %{__make} ctypes-python @@ -502,7 +524,7 @@ cd subversion/bindings/swig/perl/native %{__make} -j1 cd - %endif -%if %{with javahl} +%if %{with java} %{__make} -j1 javahl \ javahl_javadir="%{_javadir}" %endif @@ -512,15 +534,15 @@ cd - %endif %if %{with tests} -%{__make} check +%{__make} -j1 check %if %{with csvn} -%{__make} check-ctypes-python +%{__make} -j1 check-ctypes-python %endif %if %{with python} -%{__make} check-swig-py +%{__make} -j1 check-swig-py %endif %if %{with perl} -%{__make} check-swig-pl +%{__make} -j1 check-swig-pl %endif %if %{with ruby} # disabled, see https://bugs.launchpad.net/pld-linux/+bug/734340 @@ -536,10 +558,12 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT/home/services/subversion{,/repos} -%{__make} install -j1 \ +%{__make} -j1 install \ + pkgconfig_dir=%{_pkgconfigdir} \ + toolsdir=%{_bindir} \ DESTDIR=$RPM_BUILD_ROOT \ APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ -%if %{with javahl} +%if %{with java} install-javahl \ javahl_javadir="%{_javadir}" \ %endif @@ -548,20 +572,26 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \ swig_pydir=%{py_sitedir}/libsvn \ swig_pydir_extra=%{py_sitedir}/svn \ %endif + install-tools + %if %{with csvn} - install-ctypes-python \ +# manually execute install-ctypes-python target +cd subversion/bindings/ctypes-python +%py_install +cd ../../.. %endif %if %{with ruby} -%{__make} install -j1 \ - DESTDIR=$RPM_BUILD_ROOT \ - install-swig-rb install-swig-rb-doc \ +%{__make} -j1 install-swig-rb install-swig-rb-doc \ + SWIG_RB_RI_DATADIR=$RPM_BUILD_ROOT%{ruby_ridir} \ + DESTDIR=$RPM_BUILD_ROOT # not our package -%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Kernel %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/OptionParser %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Time -%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Uconv +%if "%{ruby_abi}" >= "2.0" +%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/File +%endif %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid %endif @@ -585,6 +615,12 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve %if %{without net_client_only} install -p tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup %endif + +# rename not to conflict with standard packages. (are these needed at all?) +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff3 +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff4 + %if %{with python} || %{with csvn} %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_comp $RPM_BUILD_ROOT%{py_sitedir} @@ -600,13 +636,13 @@ cp -p tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{versio cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name} cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -%if %{with javahl} +%if %{with java} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a} %endif %if %{with swig} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a} %if %{with ruby} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la +%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/svn/ext/*.la %endif %endif %if %{with gnome} || %{with kwallet} @@ -682,6 +718,14 @@ if [ "$1" = "0" ]; then %service -q httpd restart fi +%post -n apache-mod_dontdothat_svn +%service -q httpd restart + +%postun -n apache-mod_dontdothat_svn +if [ "$1" = "0" ]; then + %service -q httpd restart +fi + %files %defattr(644,root,root,755) %doc BUGS CHANGES INSTALL README @@ -692,8 +736,9 @@ fi %attr(755,root,root) %{_bindir}/svn %attr(755,root,root) %{_bindir}/svnadmin %attr(755,root,root) %{_bindir}/svndumpfilter -%attr(755,root,root) %{_bindir}/svnrdump %attr(755,root,root) %{_bindir}/svnlook +%attr(755,root,root) %{_bindir}/svnmucc +%attr(755,root,root) %{_bindir}/svnrdump %attr(755,root,root) %{_bindir}/svnsync %attr(755,root,root) %{_bindir}/svnversion %{_mandir}/man1/svn.1* @@ -701,6 +746,7 @@ fi %{_mandir}/man1/svndumpfilter.1* %{_mandir}/man1/svnrdump.1* %{_mandir}/man1/svnlook.1* +%{_mandir}/man1/svnmucc.1* %{_mandir}/man1/svnsync.1* %{_mandir}/man1/svnversion.1* @@ -723,12 +769,14 @@ fi %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_fs-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_util-1.so.0 +%attr(755,root,root) %{_libdir}/libsvn_fs_x-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_x-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_ra-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_ra-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_local-1.so.0 -%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_%{webdavlib}-1.so.0 +%attr(755,root,root) %{_libdir}/libsvn_ra_serf-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_serf-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_svn-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_repos-1.so.*.*.* @@ -749,9 +797,10 @@ fi %endif %attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so +%attr(755,root,root) %{_libdir}/libsvn_fs_x-1.so %attr(755,root,root) %{_libdir}/libsvn_ra-1.so %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so -%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so +%attr(755,root,root) %{_libdir}/libsvn_ra_serf-1.so %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so %attr(755,root,root) %{_libdir}/libsvn_repos-1.so %attr(755,root,root) %{_libdir}/libsvn_subr-1.so @@ -765,13 +814,39 @@ fi %endif %{_libdir}/libsvn_fs_fs-1.la %{_libdir}/libsvn_fs_util-1.la +%{_libdir}/libsvn_fs_x-1.la %{_libdir}/libsvn_ra-1.la %{_libdir}/libsvn_ra_local-1.la -%{_libdir}/libsvn_ra_%{webdavlib}-1.la +%{_libdir}/libsvn_ra_serf-1.la %{_libdir}/libsvn_ra_svn-1.la %{_libdir}/libsvn_repos-1.la %{_libdir}/libsvn_subr-1.la %{_libdir}/libsvn_wc-1.la +%if %{with gnome} +# only for feature check, linking will fail (no libsvn_auth_gnome_keyring.so) +%{_pkgconfigdir}/libsvn_auth_gnome_keyring.pc +%endif +%if %{with kwallet} +# only for feature check, linking will fail (no libsvn_auth_kwallet.so) +%{_pkgconfigdir}/libsvn_auth_kwallet.pc +%endif +%{_pkgconfigdir}/libsvn_client.pc +%{_pkgconfigdir}/libsvn_delta.pc +%{_pkgconfigdir}/libsvn_diff.pc +%{_pkgconfigdir}/libsvn_fs.pc +%if %{without net_client_only} +%{_pkgconfigdir}/libsvn_fs_base.pc +%endif +%{_pkgconfigdir}/libsvn_fs_fs.pc +%{_pkgconfigdir}/libsvn_fs_util.pc +%{_pkgconfigdir}/libsvn_fs_x.pc +%{_pkgconfigdir}/libsvn_ra.pc +%{_pkgconfigdir}/libsvn_ra_local.pc +%{_pkgconfigdir}/libsvn_ra_serf.pc +%{_pkgconfigdir}/libsvn_ra_svn.pc +%{_pkgconfigdir}/libsvn_repos.pc +%{_pkgconfigdir}/libsvn_subr.pc +%{_pkgconfigdir}/libsvn_wc.pc %{_includedir}/%{name}-1 %{_examplesdir}/%{name}-%{version} @@ -786,9 +861,10 @@ fi %endif %{_libdir}/libsvn_fs_fs-1.a %{_libdir}/libsvn_fs_util-1.a +%{_libdir}/libsvn_fs_x-1.a %{_libdir}/libsvn_ra-1.a %{_libdir}/libsvn_ra_local-1.a -%{_libdir}/libsvn_ra_%{webdavlib}-1.a +%{_libdir}/libsvn_ra_serf-1.a %{_libdir}/libsvn_ra_svn-1.a %{_libdir}/libsvn_repos-1.a %{_libdir}/libsvn_subr-1.a @@ -799,6 +875,8 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libsvn_auth_gnome_keyring-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_gnome_keyring-1.so.0 +# does anything use it? requires libsvn_auth_gnome_keyring.so +#%{_pkgconfigdir}/libsvn_auth_gnome_keyring.pc %endif %if %{with kwallet} @@ -806,6 +884,8 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libsvn_auth_kwallet-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_kwallet-1.so.0 +# does anything use it? requires libsvn_auth_kwallet.so +#%{_pkgconfigdir}/libsvn_auth_kwallet.pc %endif %if %{without net_client_only} @@ -823,15 +903,37 @@ fi %files tools %defattr(644,root,root,755) +# tools/backup/hot-backup.py %attr(755,root,root) %{_bindir}/svn-hot-backup +# tools/diff +%attr(755,root,root) %{_bindir}/svndiff +%attr(755,root,root) %{_bindir}/svndiff3 +%attr(755,root,root) %{_bindir}/svndiff4 + +# tools/server-side +%attr(755,root,root) %{_bindir}/svnfsfs +%attr(755,root,root) %{_bindir}/svn-populate-node-origins-index +%attr(755,root,root) %{_bindir}/svnauthz +%attr(755,root,root) %{_bindir}/svnauthz-validate + +# tools/client-side +%attr(755,root,root) %{_bindir}/svnbench + +# tools/dev/svnraisetreeconflict +%attr(755,root,root) %{_bindir}/svnraisetreeconflict + +# tools/dev/ +%attr(755,root,root) %{_bindir}/fsfs-access-map +%attr(755,root,root) %{_bindir}/x509-parser + %files -n bash-completion-subversion %defattr(644,root,root,755) /etc/bash_completion.d/%{name} %endif # net_client_only -%if %{with javahl} +%if %{with java} %files -n java-subversion %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libsvnjavahl-1.so.*.*.* @@ -879,7 +981,6 @@ fi %dir %{perl_vendorarch}/auto/SVN %dir %{perl_vendorarch}/auto/SVN/* %attr(755,root,root) %{perl_vendorarch}/auto/SVN/*/*.so -%{perl_vendorarch}/auto/SVN/*/*.bs %{_mandir}/man3/*.3pm* %endif @@ -889,11 +990,10 @@ fi %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_swig_ruby-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so -%dir %{ruby_sitelibdir}/svn -%{ruby_sitelibdir}/svn/*.rb -%dir %{ruby_sitearchdir}/svn -%dir %{ruby_sitearchdir}/svn/ext -%attr(755,root,root) %{ruby_sitearchdir}/svn/ext/*.so +%dir %{ruby_vendorarchdir}/svn +%{ruby_vendorarchdir}/svn/*.rb +%dir %{ruby_vendorarchdir}/svn/ext +%attr(755,root,root) %{ruby_vendorarchdir}/svn/ext/*.so %{ruby_ridir}/Svn %endif @@ -908,4 +1008,9 @@ fi %doc subversion/mod_authz_svn/INSTALL %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_authz_svn.conf %attr(755,root,root) %{apachelibdir}/mod_authz_svn.so + +%files -n apache-mod_dontdothat_svn +%defattr(644,root,root,755) +%doc tools/server-side/mod_dontdothat/README +%attr(755,root,root) %{apachelibdir}/mod_dontdothat.so %endif