OBS User unknown 2007-01-25 17:26:57 +00:00 committed by Git OBS Bridge
parent 71eedf31b8
commit 945096ab64
2 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 25 13:21:33 CET 2007 - olh@suse.de
- add svnmerge.py to subversion-tools (236700)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 29 13:00:18 CET 2006 - meissner@suse.de Sun Oct 29 13:00:18 CET 2006 - meissner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package subversion (Version 1.4.0) # spec file for package subversion (Version 1.4.0)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -13,7 +13,7 @@
Name: subversion Name: subversion
BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig
Version: 1.4.0 Version: 1.4.0
Release: 19 Release: 40
# #
%define apxs /usr/sbin/apxs2 %define apxs /usr/sbin/apxs2
%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) %define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq
# #
Summary: A Concurrent Versioning system similar to but better than CVS Summary: A Concurrent Versioning system similar to but better than CVS
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
License: The Apache Software License, Other License(s), see package License: The Apache Software License
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
URL: http://subversion.tigris.org URL: http://subversion.tigris.org
Source0: subversion-1.4.x.tar.bz2 Source0: subversion-1.4.x.tar.bz2
@ -132,7 +132,7 @@ http://subversion.tigris.org
%define cvs2svn_dir cvs2svn-1.4.x %define cvs2svn_dir cvs2svn-1.4.x
%package -n cvs2svn %package -n cvs2svn
Version: 1.4.0 Version: 1.4.0
Release: 13 Release: 34
Provides: subversion-cvs2svn Provides: subversion-cvs2svn
Obsoletes: subversion-cvs2svn Obsoletes: subversion-cvs2svn
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -152,7 +152,7 @@ See /usr/share/doc/packages/cvs2svn directory for more information.
%package -n viewvc %package -n viewvc
Version: 1.0.1 Version: 1.0.1
Release: 15 Release: 36
Requires: subversion-python Requires: subversion-python
Provides: subversion-viewcvs viewcvs Provides: subversion-viewcvs viewcvs
Obsoletes: subversion-viewcvs viewcvs Obsoletes: subversion-viewcvs viewcvs
@ -347,6 +347,8 @@ cp -Lav %{S:43} $RPM_BUILD_ROOT/usr/bin/svndiff
mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
cp -avL contrib/client-side/psvn/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ cp -avL contrib/client-side/psvn/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
# #
cp -avL contrib/client-side/svnmerge.py $RPM_BUILD_ROOT/usr/bin
#
mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
cp -av %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.conf cp -av %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.conf
cp -av %{S:8} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.viewvc.conf cp -av %{S:8} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.viewvc.conf
@ -477,6 +479,7 @@ cp -a %_sourcedir/subversion.sysconfig.svnserve $RPM_BUILD_ROOT/var/adm/fillup-t
%defattr(-,root,root) %defattr(-,root,root)
%dir /usr/share/subversion %dir /usr/share/subversion
/usr/share/subversion/tools /usr/share/subversion/tools
%attr(755,root,root) /usr/bin/svnmerge.py
%files server %files server
%defattr(-,root,root) %defattr(-,root,root)
@ -492,6 +495,8 @@ cp -a %_sourcedir/subversion.sysconfig.svnserve $RPM_BUILD_ROOT/var/adm/fillup-t
%config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewvc.conf %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewvc.conf
%changelog -n subversion %changelog -n subversion
* Thu Jan 25 2007 - olh@suse.de
- add svnmerge.py to subversion-tools (236700)
* Sun Oct 29 2006 - meissner@suse.de * Sun Oct 29 2006 - meissner@suse.de
- use RPM_OPT_FLAGS also for C++ - use RPM_OPT_FLAGS also for C++
* Thu Sep 28 2006 - ro@suse.de * Thu Sep 28 2006 - ro@suse.de