- up to 1.6.13

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 87b6d5b6fe85c8fa39d7e0df648747c839805620..248ec597e7d9c4d18abb7103685585e54486039d 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,8 +1,8 @@
 # TODO:
-# - fix java build with java-gcj-compat and s/java-sun/jdk/
 # - 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
@@ -16,10 +16,6 @@
 %bcond_without kwallet                 # build without kde4 wallet support
 %bcond_without gnome                   # build without gnome keyring support
 #
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
-%undefine      with_javahl
-%endif
-#
 %{!?with_net_client_only:%include      /usr/lib/rpm/macros.perl}
 %define        apxs    /usr/sbin/apxs
 %define        pdir    SVN
@@ -35,12 +31,12 @@ 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.9
+Version:       1.6.13
 Release:       1
 License:       Apache/BSD-like
 Group:         Development/Version Control
 Source0:       http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 9c30a47b1d48664e7afef68bb4834c53
+# Source0-md5: 7ae1c827689f21cf975804005be30aeb
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
@@ -59,7 +55,7 @@ URL:          http://subversion.apache.org/
 %{?with_apache:BuildRequires:  apache-devel >= 2.2.0-8}
 BuildRequires: automake
 BuildRequires: db-devel >= 4.1.25
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.559
 %if %{with perl}
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -75,8 +71,7 @@ BuildRequires:        ruby-devel
 BuildRequires: swig-ruby >= 1.3.24
 %endif
 %if %{with javahl}
-BuildRequires: java-sun
-BuildRequires: java-sun-tools
+BuildRequires: jdk
 %endif
 BuildRequires: cyrus-sasl-devel
 %endif
@@ -86,9 +81,10 @@ BuildRequires:       autoconf >= 2.59
 BuildRequires: bison
 BuildRequires: expat-devel
 BuildRequires: gettext-devel
-%{?with_gnome:BuildRequires:   gnome-keyring-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
@@ -101,6 +97,7 @@ BuildRequires:       serf-devel
 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)
 
 %define                _libexecdir             %{_libdir}/svn
@@ -432,6 +429,7 @@ chmod +x ./autogen.sh && ./autogen.sh
        --%{?with_javahl:en}%{!?with_javahl:dis}able-javahl \
 %endif
        --with-jdk="%{java_home}" \
+       --without-jikes \
 %if %{with neon}
        --without-serf \
        --with-neon=%{_prefix} \
@@ -596,7 +594,15 @@ fi
 %post -n apache-mod_dav_svn
 %service -q httpd restart
 
-%preun -n apache-mod_dav_svn
+%postun -n apache-mod_dav_svn
+if [ "$1" = "0" ]; then
+       %service -q httpd restart
+fi
+
+%post -n apache-mod_authz_svn
+%service -q httpd restart
+
+%postun -n apache-mod_authz_svn
 if [ "$1" = "0" ]; then
        %service -q httpd restart
 fi
@@ -793,19 +799,12 @@ 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 %{_libdir}/ruby/site_ruby/[0-9].[0-9]
-%dir %{_libdir}/ruby/site_ruby/*/svn
-%{_libdir}/ruby/site_ruby/*/svn/*.rb
-%dir %{_libdir}/ruby/site_ruby/*/*-*
-%dir %{_libdir}/ruby/site_ruby/*/*-*/svn
-%dir %{_libdir}/ruby/site_ruby/*/*-*/svn/ext
-%attr(755,root,root) %{_libdir}/ruby/site_ruby/*/*-*/svn/ext/*.so
-%{_datadir}/ri/*.*/system/OptionParser
-%{_datadir}/ri/*.*/system/Svn
-%{_datadir}/ri/*.*/system/Time
-%{_datadir}/ri/*.*/system/Uconv
-%{_datadir}/ri/*.*/system/*.rid
-%{_datadir}/ri/*.*/system/Kernel/*
+%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
+%{ruby_ridir}/Svn
 %endif
 
 %if %{with apache}