- fixed libtool patch (inst_prefix case was in wrong place) - now aspell

  builds correctly
- BuildConflicts: aspell-devel < 0.50 (to avoid linking libpspell with
  -laspell with old SONAME)

Changed files:
    aspell-libtool.patch -> 1.2
    aspell.spec -> 1.38

diff --git a/aspell-libtool.patch b/aspell-libtool.patch
index 5659e7624ea6bae79ded948bc106bebfe8c356f3..d4b1ab975e0a4a71dea6f8e17167101234951162 100644 (file)
--- a/aspell-libtool.patch
+++ b/aspell-libtool.patch
@@ -10,17 +10,17 @@ diff -urN aspell-0.50.2.orig/ltmain.sh aspell-0.50.2/ltmain.sh
      avoid_version=no
      dlfiles=
 @@ -902,6 +903,11 @@
-           prev=
-           continue
-           ;;
-+        inst_prefix)
-+          inst_prefix_dir="$arg"
-+          prev=
-+          continue
-+          ;;
-         self)
-           if test "$prev" = dlprefiles; then
-             dlself=yes
+         prev=
+         continue
+         ;;
++      inst_prefix)
++        inst_prefix_dir="$arg"
++        prev=
++        continue
++        ;;
+       release)
+         release="-$arg"
+         prev=
 @@ -1146,6 +1152,10 @@
        fi
        continue

diff --git a/aspell.spec b/aspell.spec
index 18c863b6c1b4c58e6fb1bb034d8b48e4e593b86b..bb1cdd560a1549f85d4bdcd5314663e9e98b0251 100644 (file)
--- a/aspell.spec
+++ b/aspell.spec
@@ -14,6 +14,7 @@ BuildRequires:        autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildConflicts:        aspell-devel < 0.50
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libaspell10
 Obsoletes:     pspell