diff --git a/subversion.changes b/subversion.changes index 74c0595..1dcd21e 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Oct 21 18:01:34 CEST 2011 - dmueller@suse.de + +- merge in fixes from stsp.elego.de: + * Simplify tools install and ship a smaller amount of tools. + Should fix rpmlint complaining about .libs/ directories + and various other illegal files ending up in the package. + Users are better off downloading the scripts previously shipped + in this package directly from the upstream svn repository. + ------------------------------------------------------------------- Fri Oct 21 17:56:21 CEST 2011 - dmueller@suse.de diff --git a/subversion.spec b/subversion.spec index 0325e31..4d56b7a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -38,19 +38,13 @@ Release: 1 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 %define sqlite_version 3.6.13 -%if 0%{?suse_version} > 910 -BuildRequires: update-alternatives -%endif # suse_version > 910 BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel BuildRequires: pkgconfig -%if 0%{?sles_version} == 9 -BuildRequires: python-xml python25 python25-devel -%else BuildRequires: python-devel python-xml -%endif +BuildRequires: update-alternatives %if %with_python_ctypes -BuildRequires: ctypesgen -%endif # with_python_ctypes +#BuildRequires: ctypesgen +%endif %if %with_ruby BuildRequires: ruby-devel %endif # with_ruby @@ -71,26 +65,13 @@ BuildRequires: libserf-devel %if %with_kde4_kwallet BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel %endif # with_kde4_kwallet -%ifarch ppc ppc64 -# no JDK on ppc -%define with_java 0 -%else -%if 0%{?sles_version} -# no JDK on SLE either -%define with_java 0 -%else %if 0%{?suse_version} >= 1130 -# OpenJDK is available by default on openSUSE >= 11.3 %define with_java 1 -BuildRequires: java-1_6_0-openjdk-devel +BuildRequires: java-devel >= 1.6.0 +BuildRequires: junit %else %define with_java 0 -%endif # suse_version >= 1130 -%endif # sles_version -%endif # ifarch -%if %with_java -BuildRequires: junit -%endif #with_java +%endif %if 0%{?suse_version} > 1030 BuildRequires: libneon-devel %else @@ -219,9 +200,6 @@ License: ASLv2 ; Subversion License, http://subversion.tigris.org/license Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories Requires: subversion = %{version} -%if 0%{?sles_version} == 9 -Requires: python25 -%endif %description python Provides Python (SWIG) support for Subversion. @@ -242,7 +220,7 @@ Provides high-level Python support for Subversion, based on ctypes. %if %with_ruby %package ruby -License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Allows Ruby scripts to directly use Subversion repositories Requires: subversion = %{version} @@ -255,7 +233,7 @@ Provides Ruby (SWIG) support for Subversion. %endif # with_ruby %package server -License: ASLv2 +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} apache2 %{apache_mmn} @@ -271,7 +249,7 @@ http://subversion.tigris.org %if %with_kde4_kwallet %package -n libsvn_auth_kwallet-1-0 -License: Subversion license, http://subversion.tigris.org/license-1.html +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -283,7 +261,7 @@ Provides KWallet integration for Subversion. %if %with_gnome_keyring %package -n libsvn_auth_gnome_keyring-1-0 -License: Subversion license, http://subversion.tigris.org/license-1.html +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -314,11 +292,8 @@ popd #./sqlite-amalgamation # %patch11 -p0 %patch12 -p0 -# %patch20 -%if 0%{?suse_version} > 930 %patch23 -p0 -%endif %patch31 %patch33 %patch35 @@ -441,13 +416,9 @@ do fi echo done >> build-outputs.mK -export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g" -CFLAGS="$CFLAGS -fpie" -export LDFLAGS=-pie -%if 0%{?suse_version} > 1000 -CFLAGS="$CFLAGS -fstack-protector" -%endif # suse_version > 1000 +export CFLAGS="$(%{apxs} -q CFLAGS) %{optflags} -fpie -fstack-protector" export CXXFLAGS="$CFLAGS" +export LDFLAGS=-pie export PATH="${SWIG_ROOT}/bin:${PATH}" %configure \ --with-editor="vim -c 'set tw=72 et' " \ @@ -479,9 +450,6 @@ export PATH="${SWIG_ROOT}/bin:${PATH}" %endif --disable-mod-activation \ --disable-static -%if 0%{?suse_version} == 910 -sed --in-place=~ "s,\/usr\/lib ,%{_libdir} ,g" Makefile -%endif %__make %{?jobs:-j%jobs} SWIG_LDFLAGS= # if [ "$with_jdk" != "" ] ; then @@ -568,43 +536,23 @@ cat %name.lang > files.subversion cat with_jdk.files >> files.subversion # # tools -mkdir -p $RPM_BUILD_ROOT/usr/share/subversion/ -cp -a tools $RPM_BUILD_ROOT/usr/share/subversion/ -#m -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/cvs2svn -mkdir $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs -cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs.README $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/README -cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/ -sed 's:@SVN_BINDIR@:/usr/bin:' contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in > $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl -chmod 755 $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl -find $RPM_BUILD_ROOT \( -name .svn -o -name CVS -o -name tests \) -type d -print0 | xargs -0 rm -rfv -find $RPM_BUILD_ROOT \( -name "*.a" -o -name "*.c" \) -type f -print0 | xargs -0 rm -rfv -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/buildbot -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/diff -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/dist -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/hook-scripts/verify-po.py -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/po -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/server-side/*svn_dav_log_parse* -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/test-scripts +%__make DESTDIR="$RPM_BUILD_ROOT" install-tools +# add svn-rep-sharing-stats,svnmucc for subversion 1.7! +%__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svnauthz-validate} $RPM_BUILD_ROOT%{_bindir} +# discard all other tools +%__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools # # # -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -cp -aL %{S:13} $RPM_BUILD_ROOT/etc/xinetd.d/svnserve +install -m 644 -D %{S:13} $RPM_BUILD_ROOT/etc/xinetd.d/svnserve install -m 755 -D %{S:9} $RPM_BUILD_ROOT/etc/init.d/svnserve ln -sv /etc/init.d/svnserve $RPM_BUILD_ROOT/usr/sbin/rcsvnserve -cp -aL %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve -mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve +install -m 644 -D %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve +install -m 644 -D %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve #useless libtool stuff rm -f %{buildroot}%{_libdir}/*.la -pushd tools/server-side -%__install -m0755 \ - svn-populate-node-origins-index \ - svnauthz-validate \ - "%{buildroot}%{_bindir}/" # delete or the binaries will also be installed under /usr/share %__rm "%{buildroot}%{_datadir}/subversion/tools/server-side"/{svn-populate-node-origins-index,svnauthz-validate} popd #tools/server-side