From 7ea58597030fde272fce2c89b4d786c4c5830c0a Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 8 Feb 2014 15:35:13 +0100
Subject: [PATCH] - adjusted kde-am patch to support also automake 1.12 through
 1.14 - ported extension_loader patch to boost::filesystem v3 - somespec
 cleanups

---
 arts-extension_loader.patch |  4 ++--
 arts.spec                   | 12 ++++++------
 kde-am.patch                | 11 ++++++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/arts-extension_loader.patch b/arts-extension_loader.patch
index 3824573..647ea55 100644
--- a/arts-extension_loader.patch
+++ b/arts-extension_loader.patch
@@ -35,7 +35,7 @@
 +			i != boost::filesystem::directory_iterator(); ++i )
 +		{
 +			boost::smatch m;
-+			if ( boost::regex_match( i->string(), m, re ) )
++			if ( boost::regex_match( i->path().string(), m, re ) )
 +				return m.str();
 +		}
 +		return ( p + ".la" );
@@ -58,7 +58,7 @@
 +	{
 +		boost::filesystem::path p( filename );
 +		if ( p.has_root_directory() )
-+			dlfilename = makeLibraryName( p.branch_path().string(), p.leaf() );
++			dlfilename = makeLibraryName( p.branch_path().string(), p.filename().string() );
 +	}
 +	catch ( boost::filesystem::filesystem_error const& )
 +	{
diff --git a/arts.spec b/arts.spec
index c1996d8..cf46329 100644
--- a/arts.spec
+++ b/arts.spec
@@ -1,10 +1,10 @@
 #
 # Conditional build:
-%bcond_without	alsa	# disable ALSA support
-%bcond_with	nas	# enable NAS support
-%bcond_with	arts			# build with aRts support
-%bcond_without	esd	# disable esound support
-%bcond_without	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
+%bcond_without	alsa			# ALSA support
+%bcond_with	nas			# NAS support
+%bcond_with	arts			# aRts support (i.e. actually build this package)
+%bcond_without	esd			# EsounD support
+%bcond_without	hidden_visibility	# '--fvisibility=hidden' & '--fvisibility-inlines-hidden' g++ opts
 
 %define		_state		stable
 %define		_kdever		3.5.10
@@ -208,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # it seems to be only (lt_)dlopened, nothing links with it - so not needed
-rm -f $RPM_BUILD_ROOT%{_libdir}/libx11globalcomm.{la,so}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libx11globalcomm.{la,so}
 
 # remove unwanted boost deps from .la
 sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
diff --git a/kde-am.patch b/kde-am.patch
index 5a23f3a..1d412a5 100644
--- a/kde-am.patch
+++ b/kde-am.patch
@@ -5,7 +5,16 @@
      exit 1
      ;;
 -  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[01234]*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
+@@ -135,7 +135,7 @@
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing --copy || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
-- 
2.43.0