pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove pure sles9 stuff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=51
This commit is contained in:
Dirk Mueller 2011-07-21 14:47:59 +00:00 committed by Git OBS Bridge
parent 9082c02775
commit 3dca11f626
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
subversion.spec
View File

@ -18,27 +18,14 @@
# norootforbuild # norootforbuild
%if 0%{?sles_version} == 9 %if 0%{?sles_version} > 9
%define __python %{_usr}/bin/python2.5
%endif
%if 0%{?sles_version} == 9
%define with_ruby 0
%define with_python_ctypes 0
%else
%define with_ruby 1 %define with_ruby 1
%define with_python_ctypes 0 %define with_python_ctypes 0
%endif %endif
%define with_intree_sqlite 1 %define with_intree_swig 0%{?suse_version} < 1110
%if 0%{?suse_version} > 1010 %define with_gnome_keyring 0%{?suse_version} > 1010
%define with_gnome_keyring 1 %define with_intree_sqlite 0%{?suse_version} < 1120
%else %define with_kde4_kwallet 0%{?suse_version} > 1030
%define with_gnome_keyring 0
%endif # suse_version > 1010
%if 0%{?suse_version} > 1030
%define with_kde4_kwallet 1
%else
%define with_kde4_kwallet 0
%endif # suse_version > 1030
Name: subversion Name: subversion
Version: 1.6.17 Version: 1.6.17
@ -74,8 +61,7 @@ BuildRequires: gnome-keyring-devel
%endif %endif
%endif # with_gnome_keyring %endif # with_gnome_keyring
%if %with_kde4_kwallet %if %with_kde4_kwallet
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel
BuildRequires: kdelibs4-core libkde4-devel libqt4-devel
%endif # with_kde4_kwallet %endif # with_kde4_kwallet
%ifarch ppc ppc64 %ifarch ppc ppc64
# no JDK on ppc # no JDK on ppc
@ -139,8 +125,10 @@ Source12: subversion.sysconfig.svnserve.remoteaccess
Source13: subversion.xinetd.svnserve Source13: subversion.xinetd.svnserve
Source42: subversion.svngrep.sh Source42: subversion.svngrep.sh
Source43: subversion.svndiff.sh Source43: subversion.svndiff.sh
%if %with_intree_swig
# http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz # http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz
Source90: swig-%{swig_version}.tar.bz2 Source90: swig-%{swig_version}.tar.bz2
%endif
%if %with_intree_sqlite %if %with_intree_sqlite
# http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz # http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
Source91: sqlite-amalgamation-%{sqlite_version}.tar.bz2 Source91: sqlite-amalgamation-%{sqlite_version}.tar.bz2
@ -372,6 +360,7 @@ mkdir BUILDPATH
export PATH="$PWD/BUILDPATH:$PATH" export PATH="$PWD/BUILDPATH:$PATH"
export PYTHON="%{_usr}/bin/python2.5" export PYTHON="%{_usr}/bin/python2.5"
%endif %endif
%if %with_intree_swig
SWIG_ROOT=`cd ..; pwd`/intree-swig SWIG_ROOT=`cd ..; pwd`/intree-swig
pushd "../swig-%{swig_version}" pushd "../swig-%{swig_version}"
CFLAGS="%{optflags}" \ CFLAGS="%{optflags}" \
@ -397,6 +386,8 @@ CXXFLAGS="%{optflags}" \
%__make %{?jobs:-j%{jobs}} %__make %{?jobs:-j%{jobs}}
%__make install %__make install
popd #swig popd #swig
%endif
with_jdk=none with_jdk=none
%if %with_java %if %with_java
for i in \ for i in \
@ -466,10 +457,8 @@ do
echo echo
done >> build-outputs.mK done >> build-outputs.mK
export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g" export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g"
%if 0%{?suse_version} > 930
CFLAGS="$CFLAGS -fpie" CFLAGS="$CFLAGS -fpie"
export LDFLAGS=-pie export LDFLAGS=-pie
%endif # suse_version > 930
%if 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
CFLAGS="$CFLAGS -fstack-protector" CFLAGS="$CFLAGS -fstack-protector"
%endif # suse_version > 1000 %endif # suse_version > 1000
@ -535,16 +524,9 @@ pushd tools/server-side
for f in svn-populate-node-origins-index svnauthz-validate; do for f in svn-populate-node-origins-index svnauthz-validate; do
%__cc %{optflags} ${TOOLS_CFLAGS} ${TOOLS_LIBS} -o "${f}" "${f}.c" %__cc %{optflags} ${TOOLS_CFLAGS} ${TOOLS_LIBS} -o "${f}" "${f}.c"
done done
%if 0%{?sles_version} == 9
%__sed -i 's|^#![[:space:]]*/usr/bin/env[[:space:]]*python[[:space:]]|#!/usr/bin/python2.5|' *.py
%endif
popd #tools/server-side popd #tools/server-side
%install %install
%if 0%{?sles_version} == 9
export PATH="$PWD/BUILDPATH:$PATH"
export PYTHON="%{_usr}/bin/python2.5"
%endif
if [ -f with_jdk ] ; then if [ -f with_jdk ] ; then
with_jdk=install-javahl with_jdk=install-javahl
else else
@ -648,9 +630,6 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion
# Don't run regression tests on Factory, they take too long to complete. # Don't run regression tests on Factory, they take too long to complete.
# This check needs to be bumped with every release: # This check needs to be bumped with every release:
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
%if 0%{?sles_version} == 9
export PATH="$PWD/BUILDPATH:$PATH"
%endif # sles_version == 9
# During "make check", auth-test loads DSOs at runtime and can't find # During "make check", auth-test loads DSOs at runtime and can't find
# them if we don't set up LD_LIBRARY_PATH as below. # them if we don't set up LD_LIBRARY_PATH as below.
export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH"