X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=subversion.spec;h=b8e9f1e7472013e7ff468367c22a50a785464139;hb=f9c8674f55c2085dcda503bf95d0b8fdd3e29a40;hp=4efc013995d018e140b0f8e414565e704dca7232;hpb=3c20027241791fa4637b0b92f02e13b56ae07d50;p=packages%2Fsubversion.git diff --git a/subversion.spec b/subversion.spec index 4efc013..b8e9f1e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,45 +1,60 @@ -# TODO: -# - remove net_client_only and add db bcond (then without apache and -# without db => net_client_only - spec will be more simpler, I think) -# - finish ruby -# - http://subversion.tigris.org/issues/show_bug.cgi?id=2753 -# # Conditional build: %bcond_with net_client_only # build only net client -%bcond_without neon # use serf instead of neon -%bcond_without python # build without python bindings (broken) -%bcond_without perl # build without perl 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 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_without ruby # build without Ruby bindings +%bcond_without apache # build without Apache support (webdav, etc) +%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 gnome # build without gnome keyring support +%bcond_without db # disable Subversion Berkeley DB based filesystem library +%bcond_with db6 # allow BDB6 (not tested by upstream, released on AGPL) -%{!?with_net_client_only:%include /usr/lib/rpm/macros.perl} -%define apxs /usr/sbin/apxs -%define pdir SVN -%define pnam _Core +# for AC: --without csvn,gnome,java,kde,ruby -%if !%{with kde} +%if %{with net_client_only} +%undefine with_apache +%undefine with_db +%undefine with_swig +%undefine with_java +%undefine with_csvn +%undefine with_gnome +%undefine with_kde +%endif + +%if %{without swig} +%undefine with_perl +%undefine with_python +%undefine with_ruby +%endif + +%if %{without kde} %undefine with_kwallet %endif -%if %{with neon} -%define webdavlib neon -%else -%define webdavlib serf + +%if %{without python} && %{without perl} && %{without ruby} +%undefine with_swig %endif + +%define apxs /usr/sbin/apxs +%define pdir SVN +%define pnam _Core + +%{?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.6.15 +Version: 1.9.0 Release: 1 -License: Apache/BSD-like +License: Apache v2.0 Group: Development/Version Control -Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 113fca1d9e4aa389d7dc2b210010fa69 +Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 +# Source0-md5: 20ae7b0d4ef07eeaf73eb4e23317b495 Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init @@ -53,55 +68,53 @@ Patch1: %{name}-DESTDIR.patch Patch2: %{name}-ruby-datadir-path.patch Patch3: %{name}-tests.patch URL: http://subversion.apache.org/ -%if %{with net_client_only} -%global apache_modules_api 0 -%else -%{?with_apache:BuildRequires: apache-devel >= 2.2.0-8} -BuildRequires: autoconf +%{?with_apache:BuildRequires: apache-devel >= 2.4.14} +BuildRequires: apr-devel >= 1:1.0.0 +BuildRequires: apr-util-devel >= 1:1.2.8-3 +BuildRequires: autoconf >= 2.59 BuildRequires: automake +BuildRequires: bison +BuildRequires: cyrus-sasl-devel +%if %{with kwallet} || %{with gnome} +BuildRequires: dbus-devel +%endif BuildRequires: db-devel >= 4.1.25 -BuildRequires: libtool -BuildRequires: rpmbuild(macros) >= 1.583 +%{!?with_db6:BuildRequires: db-devel < 6} +BuildRequires: expat-devel +BuildRequires: gettext-tools +%{?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.2.1 +BuildRequires: sqlite3-devel >= 3.6.18 +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 python} -BuildRequires: python-ctypesgen -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 1:2.4 BuildRequires: swig-python >= 1.3.24 %endif %if %{with ruby} -BuildRequires: ruby-devel +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 -%endif -BuildRequires: cyrus-sasl-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: expat-devel -BuildRequires: gettext-devel -%{?with_gnome:BuildRequires: libgnome-keyring-devel} -%{?with_kwallet:BuildRequires: kde4-kdelibs-devel} -BuildRequires: libtool >= 1.4-9 -BuildRequires: pkgconfig -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 -BuildRequires: python >= 2.2 -BuildRequires: python-modules >= 2.2 Requires: %{name}-libs = %{version}-%{release} %requires_ge sqlite3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -110,7 +123,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 @@ -158,7 +171,7 @@ 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: serf >= 1.2.1 Obsoletes: libsubversion0 %description libs @@ -174,7 +187,7 @@ 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: serf-devel >= 1.2.1 Obsoletes: libsubversion0-devel %description devel @@ -233,8 +246,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 @@ -250,6 +263,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. @@ -281,8 +297,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 @@ -299,8 +315,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. @@ -347,7 +363,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 @@ -357,12 +373,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} @@ -370,12 +387,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 @@ -389,6 +422,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 @@ -407,9 +441,6 @@ uwierzytelniać się przy użyciu Portfela KDE. 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 @@ -419,37 +450,41 @@ chmod +x ./autogen.sh && ./autogen.sh %configure \ --with-editor=vi \ --with-zlib=%{_libdir} \ -%if %{with net_client_only} - --without-apache \ - --without-swig \ - --without-apxs \ - --without-berkeley-db \ -%else --disable-runtime-module-search \ --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-apache \ --without-apxs \ %endif -%if !%{with python} && !%{with perl} && !%{with ruby} +%if %{without swig} --without-swig \ %endif - %{?with_python:--with-ctypesgen=%{_bindir}/ctypesgen.py} \ - --%{?with_javahl:en}%{!?with_javahl:dis}able-javahl \ +%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 java} + --enable-javahl \ --with-jdk="%{java_home}" \ --without-jikes \ -%if %{with neon} - --without-serf \ - --with-neon=%{_prefix} \ - --disable-neon-version-check \ %else - --with-serf=%{_prefix} \ - --without-neon \ + --disable-javahl \ %endif + --with-serf=%{_prefix} \ --with-apr=%{_bindir}/apr-1-config \ --with-apr-util=%{_bindir}/apu-1-config \ %if %{with kwallet} @@ -461,26 +496,27 @@ chmod +x ./autogen.sh && ./autogen.sh %{__make} -j1 -%if !%{with net_client_only} -# python -%if %{with python} -# ctypes bindings +%{__make} tools + +%if %{with csvn} +# Python ctypes bindings %{__make} ctypes-python -# swig bindings +%endif +%if %{with python} +# Python swig bindings %{__make} swig-py \ swig_pydir=%{py_sitedir}/libsvn \ swig_pydir_extra=%{py_sitedir}/svn %endif -# perl %if %{with perl} +# Perl swig bindings %{__make} -j1 swig-pl-lib -odir=$(pwd) cd subversion/bindings/swig/perl/native %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} -j1 -cd $odir +cd - %endif -%if %{with javahl} +%if %{with java} %{__make} -j1 javahl \ javahl_javadir="%{_javadir}" %endif @@ -488,19 +524,21 @@ cd $odir %if %{with ruby} %{__make} swig-rb %endif -%endif %if %{with tests} -%{__make} check +%{__make} -j1 check +%if %{with csvn} +%{__make} -j1 check-ctypes-python +%endif %if %{with python} -%{__make} check-ctypes-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} -%{__make} check-swig-rb +# disabled, see https://bugs.launchpad.net/pld-linux/+bug/734340 +#%{__make} check-swig-rb %endif %endif @@ -509,28 +547,44 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \ $RPM_BUILD_ROOT{%{apacheconfdir},%{apachelibdir},%{_infodir}} \ $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}} \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT/home/services/subversion{,/repos} %{__make} install -j1 \ -%if %{with javahl} + toolsdir=%{_bindir} \ + DESTDIR=$RPM_BUILD_ROOT \ + APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ +%if %{with java} install-javahl \ javahl_javadir="%{_javadir}" \ %endif -%if !%{with net_client_only} %if %{with python} install-swig-py \ + swig_pydir=%{py_sitedir}/libsvn \ + swig_pydir_extra=%{py_sitedir}/svn \ +%endif +%if %{with csvn} install-ctypes-python \ %endif + install-tools + %if %{with ruby} - install-swig-rb install-swig-rb-doc \ +%{__make} install -j1 \ + SWIG_RB_RI_DATADIR=$RPM_BUILD_ROOT%{ruby_ridir} \ + DESTDIR=$RPM_BUILD_ROOT \ + install-swig-rb install-swig-rb-doc + +# not our package +%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/OptionParser +%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Time +%if "%{ruby_version}" >= "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 - APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ - DESTDIR=$RPM_BUILD_ROOT \ - swig_pydir=%{py_sitedir}/libsvn \ - swig_pydir_extra=%{py_sitedir}/svn -%if !%{with net_client_only} && %{with perl} +%if %{with perl} %{__make} install-swig-pl-lib \ DESTDIR=$RPM_BUILD_ROOT %{__make} -C subversion/bindings/swig/perl/native install \ @@ -540,29 +594,45 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \ %endif %if %{with apache} -install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/65_mod_dav_svn.conf -install %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/66_mod_authz_svn.conf -install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/65_mod_dav_svn.conf +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/66_mod_authz_svn.conf +cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve +install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve %endif -%if !%{with net_client_only} -install tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup -%if %{with python} +%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} %py_postclean -%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.la -install tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version} %endif +%if %{with python} +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.la +# .a created on ac only +%{__rm} -f $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.a +cp -p tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version} %endif -install tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name} -install tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +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} -%{?with_javahl:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}} +%if %{with java} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a} +%endif +%if %{with swig} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la +%if %{with ruby} +%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/svn/ext/*.la +%endif +%endif %if %{with gnome} || %{with kwallet} # dlopened by soname (libsvn_auth_*-1.so.0) %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_auth_*-1.{so,la,a} @@ -636,9 +706,17 @@ 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 COPYING INSTALL README +%doc BUGS CHANGES INSTALL README %doc doc/*/*.html %doc tools/hook-scripts/*.{pl,py,example} %doc tools/hook-scripts/mailer/*.{py,example} @@ -647,17 +725,22 @@ fi %attr(755,root,root) %{_bindir}/svnadmin %attr(755,root,root) %{_bindir}/svndumpfilter %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* %{_mandir}/man1/svnadmin.1* %{_mandir}/man1/svndumpfilter.1* +%{_mandir}/man1/svnrdump.1* %{_mandir}/man1/svnlook.1* +%{_mandir}/man1/svnmucc.1* %{_mandir}/man1/svnsync.1* %{_mandir}/man1/svnversion.1* %files libs -f %{name}.lang %defattr(644,root,root,755) +%dir %{_sysconfdir}/%{name} %attr(755,root,root) %{_libdir}/libsvn_client-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_client-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_delta-1.so.*.*.* @@ -666,18 +749,22 @@ fi %attr(755,root,root) %ghost %{_libdir}/libsvn_diff-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_fs-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_fs-1.so.0 +%if %{without net_client_only} %attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_base-1.so.0 +%endif %attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so.*.*.* %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.*.*.* @@ -693,12 +780,15 @@ fi %attr(755,root,root) %{_libdir}/libsvn_delta-1.so %attr(755,root,root) %{_libdir}/libsvn_diff-1.so %attr(755,root,root) %{_libdir}/libsvn_fs-1.so +%if %{without net_client_only} %attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so +%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 @@ -707,16 +797,36 @@ fi %{_libdir}/libsvn_delta-1.la %{_libdir}/libsvn_diff-1.la %{_libdir}/libsvn_fs-1.la +%if %{without net_client_only} %{_libdir}/libsvn_fs_base-1.la +%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 +%{_npkgconfigdir}/libsvn_client.pc +%{_npkgconfigdir}/libsvn_delta.pc +%{_npkgconfigdir}/libsvn_diff.pc +%{_npkgconfigdir}/libsvn_fs.pc +%if %{without net_client_only} +%{_npkgconfigdir}/libsvn_fs_base.pc +%endif +%{_npkgconfigdir}/libsvn_fs_fs.pc +%{_npkgconfigdir}/libsvn_fs_util.pc +%{_npkgconfigdir}/libsvn_fs_x.pc +%{_npkgconfigdir}/libsvn_ra.pc +%{_npkgconfigdir}/libsvn_ra_local.pc +%{_npkgconfigdir}/libsvn_ra_serf.pc +%{_npkgconfigdir}/libsvn_ra_svn.pc +%{_npkgconfigdir}/libsvn_repos.pc +%{_npkgconfigdir}/libsvn_subr.pc +%{_npkgconfigdir}/libsvn_wc.pc %{_includedir}/%{name}-1 %{_examplesdir}/%{name}-%{version} @@ -726,12 +836,15 @@ fi %{_libdir}/libsvn_delta-1.a %{_libdir}/libsvn_diff-1.a %{_libdir}/libsvn_fs-1.a +%if %{without net_client_only} %{_libdir}/libsvn_fs_base-1.a +%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 @@ -766,13 +879,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} -%if %{with javahl} +%endif # net_client_only + +%if %{with java} %files -n java-subversion %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libsvnjavahl-1.so.*.*.* @@ -784,7 +921,7 @@ fi %if %{with python} %files -n python-subversion %defattr(644,root,root,755) -%doc tools/backup/*.py tools/examples/*.py +%doc tools/backup/*.py %attr(755,root,root) %{_libdir}/libsvn_swig_py-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsvn_swig_py-1.so.0 %attr(755,root,root) %{_libdir}/libsvn_swig_py-1.so @@ -794,7 +931,9 @@ fi %dir %{py_sitedir}/svn %{py_sitedir}/svn/*.py[co] %{_examplesdir}/python-%{name}-%{version} +%endif +%if %{with csvn} %files -n python-csvn %defattr(644,root,root,755) %doc subversion/bindings/ctypes-python/{README,TODO} @@ -818,7 +957,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 @@ -828,11 +966,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 @@ -847,6 +984,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 -%endif -%endif # net_client_only +%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