- add -gnome, -kde subpackages

This commit is contained in:
jorton 2009-06-16 14:29:46 +00:00
parent b890c23a06
commit 677efb833a
2 changed files with 45 additions and 4 deletions

View File

@ -1 +1 @@
32014fe70397357fa1e0ef8f937a0232 subversion-1.6.1.tar.gz
93f128306b11e1a1c64ff51338777952 subversion-1.6.2.tar.gz

View File

@ -14,8 +14,8 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.6.1
Release: 5%{?dist}
Version: 1.6.2
Release: 3%{?dist}
License: ASL 1.1
Group: Development/Tools
URL: http://subversion.tigris.org/
@ -28,11 +28,13 @@ Patch2: subversion-1.6.0-deplibs.patch
Patch3: subversion-1.6.1-rpath.patch
Patch6: subversion-1.6.0-pie.patch
Patch7: subversion-1.1.3-java.patch
Patch8: subversion-1.6.2-kwallet.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
BuildRequires: sqlite-devel >= 3.4.0
BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: svn = %{version}-%{release}
Requires: apr >= 1.3.0
@ -60,6 +62,24 @@ The subversion-devel package includes the static libraries and
include files for developers interacting with the subversion
package.
%package gnome
Group: Development/Tools
Summary: GNOME Keyring support for Subversion
Requires: subversion = %{version}-%{release}
%description gnome
The subversion-gnome package adds support for storing Subversion
passwords in the GNOME Keyring.
%package kde
Group: Development/Tools
Summary: KDE Wallet support for Subversion
Requires: subversion = %{version}-%{release}
%description kde
The subversion-kde package adds support for storing Subversion
passwords in the KDE Wallet.
%package -n mod_dav_svn
Group: System Environment/Daemons
Summary: Apache httpd module for Subversion server
@ -114,6 +134,7 @@ This package includes the Ruby bindings to the Subversion libraries.
%ifarch sparc64
sed -i -e 's|-fpie|-fPIE|g' Makefile.in
%endif
%patch8 -p1 -b .kwallet
%build
# Regenerate the buildsystem, so that:
@ -135,7 +156,9 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
--with-ruby-sitedir=%{ruby_sitearch} \
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
--disable-static --with-sasl=%{_prefix} \
--disable-neon-version-check
--disable-neon-version-check \
--with-gnome-keyring \
--with-kwallet
make %{?_smp_mflags} all
make swig-py swig-py-lib %{swigdirs}
make swig-pl swig-pl-lib swig-rb swig-rb-lib
@ -206,6 +229,7 @@ sed -i "/^dependency_libs/{
%if %{make_check}
%check
export LANG=C LC_ALL=C
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
make check check-swig-pl check-swig-py CLEANUP=yes
# check-swig-rb omitted: it runs svnserve
%endif
@ -248,8 +272,16 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/subversion
%exclude %{_libdir}/libsvn_swig_perl*
%exclude %{_libdir}/libsvn_swig_ruby*
%exclude %{_libdir}/libsvn_auth_kwallet*
%exclude %{_libdir}/libsvn_auth_gnome*
%exclude %{_mandir}/man*/*::*
%files gnome
%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
%files kde
%{_libdir}/libsvn_auth_kwallet-*.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/subversion-1
@ -286,6 +318,15 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Sun Jun 14 2009 Joe Orton <jorton@redhat.com> 1.6.2-3
- add -gnome, -kde subpackages
* Mon Jun 1 2009 Joe Orton <jorton@redhat.com> 1.6.2-2
- enable KWallet, gnome-keyring support
* Fri May 15 2009 Joe Orton <jorton@redhat.com> 1.6.2-1
- update to 1.6.2
* Thu May 14 2009 Joe Orton <jorton@redhat.com> 1.6.1-5
- fix libjavahl link (#496617)
- fix RPATHs in binaries (#469524)