- updated to 0.50.3

- removed libtool patch, libtoolize instead (BR: fixed libtool in CVS version)

Changed files:
    aspell-libtool.patch -> 1.3
    aspell.spec -> 1.44

diff --git a/aspell-libtool.patch b/aspell-libtool.patch
deleted file mode 100644 (file)
index d4b1ab9..0000000
--- a/aspell-libtool.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -urN aspell-0.50.2.orig/ltmain.sh aspell-0.50.2/ltmain.sh
---- aspell-0.50.2.orig/ltmain.sh       Sun Oct  6 15:12:12 2002
-+++ aspell-0.50.2/ltmain.sh    Sun Oct  6 15:32:35 2002
-@@ -807,6 +807,7 @@
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
-     avoid_version=no
-     dlfiles=
-@@ -902,6 +903,11 @@
-         prev=
-         continue
-         ;;
-+      inst_prefix)
-+        inst_prefix_dir="$arg"
-+        prev=
-+        continue
-+        ;;
-       release)
-         release="-$arg"
-         prev=
-@@ -1146,6 +1152,10 @@
-       fi
-       continue
-       ;;
-+      -inst-prefix-dir)
-+      prev=inst_prefix
-+      continue
-+      ;;
- 
-       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-       # so, if we see these flags be careful not to treat them like -L
-@@ -2237,6 +2247,7 @@
- 
-         if test "$linkmode" = prog || test "$mode" = relink; then
-           add_shlibpath=
-+          add_prefix_dir= 
-           add_dir=
-           add=
-           # Finalize command for both is simple: just hardcode it.
-@@ -2256,11 +2267,24 @@
-             add_dir="-L$libdir"
-             add="-l$name"
-           fi
-+          
-+            if test -n "$inst_prefix_dir"; then
-+            case "$libdir" in
-+            [\\/]*)
-+              add_prefix_dir="-L$inst_prefix_dir$libdir"
-+              ;;
-+            esac
-+          fi
-+          
-+          # add_prefix_dir must be appended instead, otherwise it can
-+          # possibly be overrided by any hardcoded -L/... path in deplibs 
- 
-           if test "$linkmode" = prog; then
-+            test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
-             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-           else
-+            test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-           fi
-@@ -4420,7 +4444,7 @@
-       fi
-       done
-       # Quote the link command for shipping.
--      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
-+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- 
-       # Only create the output if not a dry run.
-@@ -4721,6 +4745,24 @@
-       dir="$dir$objdir"
- 
-       if test -n "$relink_command"; then
-+        # Determine the prefix the user has applied to our future dir.
-+        inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+
-+        # Don't allow the user to place us outside of our expected
-+        # location b/c this prevents finding dependent libraries that
-+        # are installed to the same prefix.
-+        if test "$inst_prefix_dir" = "$destdir"; then
-+          $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+          exit 1
-+        fi
-+        
-+        if test -n "$inst_prefix_dir"; then
-+          # Stick the inst_prefix_dir data into the link command.
-+          relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+        else
-+          relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+        fi
-+
-         $echo "$modename: warning: relinking \`$file'" 1>&2
-         $show "$relink_command"
-         if $run eval "$relink_command"; then :

diff --git a/aspell.spec b/aspell.spec
index 1f12783db91b142e41611802468cee80248c4c53..2a391bc745b56650e5e7c318de59440066ddc6c5 100644 (file)
--- a/aspell.spec
+++ b/aspell.spec
@@ -1,20 +1,18 @@
 Summary:       GNU Aspell is an Open Source spell checker
 Summary(pl):   GNU Aspell jest kontrolerem pisowni
 Name:          aspell
-Version:       0.50.2
-Release:       3
+Version:       0.50.3
+Release:       1
 Epoch:         2
 License:       LGPL
 Group:         Applications/Text
 Vendor:                Kevin Atkinson <kevina@gnu.org>
 Source0:       ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
-Patch0:                %{name}-libtool.patch
 URL:           http://aspell.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
-BuildConflicts:        aspell-devel < 0.50
+BuildRequires: libtool >= 2:1.4e-0.20021218.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libaspell10
 Obsoletes:     pspell
@@ -72,13 +70,12 @@ statyczne aspella.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
        --enable-shared \
        --enable-static
@@ -106,8 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README manual/man-html/*.{html,png,css}
 %attr(755,root,root) %{_bindir}/a*
 %attr(755,root,root) %{_bindir}/w*
-%attr(755,root,root) %{_libdir}/lib*.so.*
-%attr(755,root,root) %{_libdir}/lib*-common-*.so
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/aspell
 %dir %{_libdir}/aspell
 
@@ -116,7 +112,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc manual/dev-html/*.{html,png,css}
 %attr(755,root,root) %{_bindir}/p*
 %attr(755,root,root) %{_libdir}/lib*.so
-%exclude %{_libdir}/lib*-common-*.so
 %{_libdir}/lib*.la
 %{_includedir}/pspell
 %{_includedir}/*.h