update to 1.7.1
(temporarily) disable failing kwallet support
This commit is contained in:
parent
b60c078aa2
commit
6264eabccb
|
@ -8,3 +8,4 @@ subversion-1.6.12.tar.bz2
|
||||||
/subversion-1.7.0.tar.bz2
|
/subversion-1.7.0.tar.bz2
|
||||||
/subversion-1.7.0
|
/subversion-1.7.0
|
||||||
/clog
|
/clog
|
||||||
|
/subversion-1.7.1.tar.bz2
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
930e6644a1b6094efd268fde6a318f04 subversion-1.7.0.tar.bz2
|
8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
%define make_check 1
|
%define make_check 1
|
||||||
|
|
||||||
%define with_java 1
|
%define with_java 1
|
||||||
|
%define with_kwallet 0
|
||||||
|
|
||||||
# set JDK path to build javahl; default for JPackage
|
# set JDK path to build javahl; default for JPackage
|
||||||
%define jdk_path /usr/lib/jvm/java
|
%define jdk_path /usr/lib/jvm/java
|
||||||
|
@ -14,8 +15,8 @@
|
||||||
|
|
||||||
Summary: A Modern Concurrent Version Control System
|
Summary: A Modern Concurrent Version Control System
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.7.0
|
Version: 1.7.1
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://subversion.apache.org/
|
URL: http://subversion.apache.org/
|
||||||
|
@ -33,7 +34,6 @@ BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
|
||||||
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
||||||
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
|
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
|
||||||
BuildRequires: sqlite-devel >= 3.4.0, file-devel
|
BuildRequires: sqlite-devel >= 3.4.0, file-devel
|
||||||
BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Provides: svn = %{version}-%{release}
|
Provides: svn = %{version}-%{release}
|
||||||
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
||||||
|
@ -85,19 +85,23 @@ for developers interacting with the subversion package.
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Summary: GNOME Keyring support for Subversion
|
Summary: GNOME Keyring support for Subversion
|
||||||
Requires: subversion%{?_isa} = %{version}-%{release}
|
Requires: subversion%{?_isa} = %{version}-%{release}
|
||||||
|
BuildRequires: gnome-keyring-devel, dbus-devel
|
||||||
|
|
||||||
%description gnome
|
%description gnome
|
||||||
The subversion-gnome package adds support for storing Subversion
|
The subversion-gnome package adds support for storing Subversion
|
||||||
passwords in the GNOME Keyring.
|
passwords in the GNOME Keyring.
|
||||||
|
|
||||||
|
%if %{with_kwallet}
|
||||||
%package kde
|
%package kde
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Summary: KDE Wallet support for Subversion
|
Summary: KDE Wallet support for Subversion
|
||||||
Requires: subversion%{?_isa} = %{version}-%{release}
|
Requires: subversion%{?_isa} = %{version}-%{release}
|
||||||
|
BuildRequires: kdelibs-devel >= 4.0.0
|
||||||
|
|
||||||
%description kde
|
%description kde
|
||||||
The subversion-kde package adds support for storing Subversion
|
The subversion-kde package adds support for storing Subversion
|
||||||
passwords in the KDE Wallet.
|
passwords in the KDE Wallet.
|
||||||
|
%endif
|
||||||
|
|
||||||
%package -n mod_dav_svn
|
%package -n mod_dav_svn
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -187,7 +191,9 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
|
||||||
--enable-javahl \
|
--enable-javahl \
|
||||||
--with-junit=%{_prefix}/share/java/junit.jar \
|
--with-junit=%{_prefix}/share/java/junit.jar \
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with_kwallet}
|
||||||
--with-kwallet \
|
--with-kwallet \
|
||||||
|
%endif
|
||||||
--with-berkeley-db || (cat config.log; exit 1)
|
--with-berkeley-db || (cat config.log; exit 1)
|
||||||
make %{?_smp_mflags} all
|
make %{?_smp_mflags} all
|
||||||
make swig-py swig-py-lib %{swigdirs}
|
make swig-py swig-py-lib %{swigdirs}
|
||||||
|
@ -279,7 +285,11 @@ export LANG=C LC_ALL=C
|
||||||
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
||||||
export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
|
export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
|
||||||
export LIBC_FATAL_STDERR_=1
|
export LIBC_FATAL_STDERR_=1
|
||||||
make check check-swig-pl check-swig-py CLEANUP=yes
|
if ! make check check-swig-pl check-swig-py CLEANUP=yes; then
|
||||||
|
: Test suite failure.
|
||||||
|
cat fails.log
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
# check-swig-rb omitted: it runs svnserve
|
# check-swig-rb omitted: it runs svnserve
|
||||||
%if %{with_java}
|
%if %{with_java}
|
||||||
make check-javahl
|
make check-javahl
|
||||||
|
@ -348,9 +358,11 @@ fi
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
|
%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
|
||||||
|
|
||||||
|
%if %{with_kwallet}
|
||||||
%files kde
|
%files kde
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libsvn_auth_kwallet-*.so.*
|
%{_libdir}/libsvn_auth_kwallet-*.so.*
|
||||||
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
@ -388,6 +400,10 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 28 2011 Joe Orton <jorton@redhat.com> - 1.7.1-1
|
||||||
|
- update to 1.7.1
|
||||||
|
- (temporarily) disable failing kwallet support
|
||||||
|
|
||||||
* Sun Nov 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-3
|
* Sun Nov 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-3
|
||||||
- Build with libmagic support.
|
- Build with libmagic support.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue