[packages/ispell] - new URLs, updated to 3.4.06

Sat Dec 16 21:53:40 CET 2023

commit b84209345e490757bef2ba2e494670594f3ef89d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 16 21:45:19 2023 +0100

    - new URLs, updated to 3.4.06

 ispell-local.h       |  3 ---
 ispell-nostrip.patch | 12 ++++-----
 ispell.spec          | 70 +++++++++++++++++++++++++++++-----------------------
 3 files changed, 45 insertions(+), 40 deletions(-)
---

diff --git a/ispell.spec b/ispell.spec
index 642e6e6..1b11eef 100644
--- a/ispell.spec
+++ b/ispell.spec
@@ -6,17 +6,17 @@ Summary(ru.UTF-8):	ispell - интерактивная программа про
 Summary(tr.UTF-8):	Etkilmli yazım denetleyici
 Summary(uk.UTF-8):	ispell - інтерактивна програма перевірки орфографії
 Name:		ispell
-Version:	3.3.02
-Release:	6
+Version:	3.4.06
+Release:	1
 License:	BSD-like
 Group:		Applications/Text
-Source0:	http://fmg-www.cs.ucla.edu/geoff/tars/%{name}-%{version}.tar.gz
-# Source0-md5:	12087d7555fc2b746425cd167af480fe
+#Source0Download: https://www.cs.hmc.edu/~geoff/ispell.html
+Source0:	https://www.cs.hmc.edu/~geoff/tars/%{name}-%{version}.tar.gz
+# Source0-md5:	efd9ede43be1b8eb2a2e02023e373ecc
 Source1:	spell
 Source2:	%{name}-local.h
-Patch0:		%{name}-3.3.02-glibc-2.10.patch
-Patch1:		%{name}-nostrip.patch
-URL:		http://ficus-www.cs.ucla.edu/geoff/ispell.html
+Patch0:		%{name}-nostrip.patch
+URL:		https://www.cs.hmc.edu/~geoff/ispell.html
 BuildRequires:	bison
 BuildRequires:	ncurses-devel
 Conflicts:	vim-ispell <= 4:6.1.212-4
@@ -87,9 +87,8 @@ Angielski słownik (lista słów) dla ispella.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
-install %{SOURCE2} local.h
+cp -f %{SOURCE2} local.h
 sed -i -e 's#define[ \t]CC[ \t].*#define CC "%{__cc}"#g' local.h
 sed -i -e 's#define[ \t]CFLAGS[ \t].*#define CFLAGS "%{rpmcflags}"#g' local.h
 sed -i -e 's#define[ \t]LDFLAGS[ \t].*#define LDFLAGS "%{rpmldflags}"#g' local.h
@@ -97,47 +96,56 @@ sed -i -e 's#define[ \t]BINDIR[ \t].*#define BINDIR "%{_bindir}"#g' local.h
 sed -i -e 's#define[ \t]LIBDIR[ \t].*#define LIBDIR "%{_libdir}/%{name}"#g' local.h
 sed -i -e 's#define[ \t]MAN1DIR[ \t].*#define MAN1DIR "%{_mandir}/man1"#g' local.h
 sed -i -e 's#define[ \t]MAN45DIR[ \t].*#define MAN45DIR "%{_mandir}/man5"#g' local.h
-sed -i -e 's#define[ \t]TEXINFODIR[ \t].*#define TEXINFODIR "%{_infodir}"#g' local.h
-sed -i -e 's#define[ \t]ELISPDIR[ \t].*#define ELISPDIR "%{_libdir}/emacs/site-lisp"#g' local.h
 
 %build
 # Make config.sh first
-PATH=.:$PATH %{__make} -j1 config.sh
-
-# Now save build-rooted version (with time-stamp) for install ...
-sed -e "s,/usr/,$RPM_BUILD_ROOT%{_prefix}/,g"  < config.sh > config.sh.INSTALL
+PATH=.:$PATH \
+%{__make} -j1 config.sh
 
 # and then make everything
-PATH=.:$PATH TEMLIB="-lncurses" \
+PATH=.:$PATH \
 	%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir},%{_infodir},%{_libdir}/{%{name},emacs/site-lisp}}
+install -d $RPM_BUILD_ROOT{%{_mandir},%{_libdir}/%{name}}
+
+PATH=.:$PATH \
+%{__make} -j1 install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-# Roll in the build-root'ed version (with time-stamp!)
-%{__mv} config.sh.INSTALL config.sh
-PATH=.:$PATH %{__make} -j1 install
+# binaries not installed, sq conflicts with squirrel
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{sq,unsq}.1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun	-p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
-
 %files
 %defattr(644,root,root,755)
-%doc README
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%doc CHANGES README WISHES
+%attr(755,root,root) %{_bindir}/buildhash
+%attr(755,root,root) %{_bindir}/defmt-c
+%attr(755,root,root) %{_bindir}/defmt-sh
+%attr(755,root,root) %{_bindir}/findaffix
+%attr(755,root,root) %{_bindir}/icombine
+%attr(755,root,root) %{_bindir}/ijoin
+%attr(755,root,root) %{_bindir}/ispell
+%attr(755,root,root) %{_bindir}/munchlist
+%attr(755,root,root) %{_bindir}/spell
+%attr(755,root,root) %{_bindir}/tryaffix
+%{_mandir}/man1/buildhash.1*
+%{_mandir}/man1/findaffix.1*
+%{_mandir}/man1/ispell.1*
+%{_mandir}/man1/munchlist.1*
+%{_mandir}/man1/tryaffix.1*
+%{_mandir}/man5/ispell.5*
 %dir %{_libdir}/ispell
 
 %files en
 %defattr(644,root,root,755)
-%{_libdir}/ispell/*
+%{_libdir}/ispell/american.hash
+%{_libdir}/ispell/americanmed.hash
+%{_libdir}/ispell/english.aff
+%{_libdir}/ispell/english.hash
diff --git a/ispell-local.h b/ispell-local.h
index 2bc2b5f..8249cd1 100644
--- a/ispell-local.h
+++ b/ispell-local.h
@@ -41,9 +41,6 @@
 #define	MAN45SECT "5"
 #define	MAN45EXT ".5"
 
-#define ELISPDIR "/usr/lib/emacs/site-lisp"
-#define TEXINFODIR "/usr/share/info"
-
 
 /*
  * Place any locally-required #include statements here
diff --git a/ispell-nostrip.patch b/ispell-nostrip.patch
index 8c15c03..0384cf6 100644
--- a/ispell-nostrip.patch
+++ b/ispell-nostrip.patch
@@ -1,17 +1,17 @@
---- ispell-3.3.02/Makefile.orig	2005-05-25 15:57:02.000000000 +0200
-+++ ispell-3.3.02/Makefile	2023-12-16 21:06:36.230691971 +0100
-@@ -307,7 +307,6 @@ install-basic:
+--- ispell-3.4.06/Makefile.orig	2023-12-16 21:20:58.833790969 +0100
++++ ispell-3.4.06/Makefile	2023-12-16 21:21:27.686967991 +0100
+@@ -336,7 +336,6 @@ install-basic:
  	@. ./config.sh; \
  	  set -x; \
- 	  cd $$BINDIR; \
+ 	  cd $(DESTDIR)$$BINDIR; \
 -	  strip ispell$$EXEEXT; \
  	  chmod 755 ispell$$EXEEXT
  	@. ./config.sh; \
  	  set -x; \
-@@ -362,7 +361,6 @@ install-dictbuild:
+@@ -392,7 +391,6 @@ install-dictbuild:
  	@. ./config.sh; \
  	  set -x; \
- 	  cd $$BINDIR; \
+ 	  cd $(DESTDIR)$$BINDIR; \
 -	  strip buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT; \
  	  chmod 755 buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT \
  	    munchlist findaffix tryaffix
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ispell.git/commitdiff/b84209345e490757bef2ba2e494670594f3ef89d

