openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File admin.diff of Package kdelibs3 (Revision 33d2ebc72d4128425e297d0d3acdf4f2)

Currently displaying revision 33d2ebc72d4128425e297d0d3acdf4f2 , Show latest

Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in.orig
+++ admin/acinclude.m4.in
@@ -4988,6 +4988,7 @@ AC_DEFUN([KDE_SET_PREFIX_CORE],
   fi
   # And delete superfluous '/' to make compares easier
   prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+  kde_libs_htmldir=$prefix/share/doc/HTML/
   exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
 
   kde_libs_prefix='$(prefix)'
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh.orig
+++ admin/cvs.sh
@@ -32,7 +32,7 @@ check_autotool_versions()
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+  autoconf* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@ esac
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+  autoheader* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -68,9 +68,10 @@ case $AUTOMAKE_STRING in
     echo "*** KDE requires automake $required_automake_version"
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+  automake*)
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
+    AUTOMAKE="$AUTOMAKE --add-missing"
     ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."
Index: admin/detect-autoconf.pl
===================================================================
--- admin/detect-autoconf.pl.orig
+++ admin/detect-autoconf.pl
@@ -216,7 +216,7 @@ $unsermake = "";
 # backward compatible: if $UNSERMAKE points to a path, use it
 $unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
 # new compatible: if it says 'yes', use the one from path
-$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
+$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} eq 'yes');
 
 ($automake_suffix) = $automake =~ /.*automake(.*)$/;
 
Index: admin/libtool.m4.in
===================================================================
--- admin/libtool.m4.in.orig
+++ admin/libtool.m4.in
@@ -2181,7 +2181,7 @@ irix5* | irix6* | nonstopux*)
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+  aarch64 | alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
     lt_cv_deplibs_check_method=pass_all ;;
   # the debian people say, arm and glibc 2.3.1 works for them with pass_all
   arm* )

Places

File admin.diff of Package kdelibs3 (Revision 33d2ebc72d4128425e297d0d3acdf4f2)

Places