[packages/uspell] - updated to 20170608 git snapshot - removed obsolete gcc4 patch

qboosh qboosh at pld-linux.org
Sun Dec 23 12:08:19 CET 2018


commit 61acbe4fb4c9af53c24e8de79d936a7692ff48cf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 23 12:12:59 2018 +0100

    - updated to 20170608 git snapshot
    - removed obsolete gcc4 patch

 uspell-gcc4.patch | 34 ----------------------------------
 uspell.spec       | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 44 deletions(-)
---
diff --git a/uspell.spec b/uspell.spec
index aee08c2..a3cc53e 100644
--- a/uspell.spec
+++ b/uspell.spec
@@ -1,16 +1,18 @@
-%define	rel	4
+%define	rel	1
 Summary:	A spelling checker/corrector for Unicode-encoded dictionaries
 Summary(pl.UTF-8):	Program sprawdzający/poprawiający pisownię dla słowników w Unikodzie
 Name:		uspell
 Version:	1.1.1
-%define		snap	20031030
+%define		snap	20170608
+%define		gitref	574aa7f6aae6775541dc3d6fc7d36e33dc7b8af7
 Release:	0.%{snap}.%{rel}
-License:	GPL
+License:	GPL v2
 Group:		Libraries
-# -d :pserver:anoncvs:anoncvs at anoncvs.abisource.com:/cvsroot uspell
-Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	f50edc2a6228dd3f7e03dc72b9e7fb46
-Patch0:		%{name}-gcc4.patch
+# FFU
+#Source0Download: https://github.com/AbiWord/uspell/releases
+# no releases yet, so use snapshot
+Source0:	https://github.com/AbiWord/uspell/archive/%{gitref}/%{name}-%{snap}.tar.gz
+# Source0-md5:	3778fcc9ab53969b5994b0555de79959
 # not exactly uspell homepage, but contains a little information
 URL:		http://www.abisource.com/enchant/
 BuildRequires:	autoconf
@@ -102,8 +104,7 @@ Słownik (lista słow) języka jidysz dla uspella. Pochodzi z własnej
 listy słów Raphaela Finkela.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n %{name}-%{gitref}
 
 %build
 %{__libtoolize}
@@ -120,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # missing from dict_DATA
-install dic/american.* $RPM_BUILD_ROOT%{_datadir}/uspell
+cp -p dic/american.* $RPM_BUILD_ROOT%{_datadir}/uspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/uspell-gcc4.patch b/uspell-gcc4.patch
deleted file mode 100644
index c7db519..0000000
--- a/uspell-gcc4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- uspell/src/lookup2.cpp.orig	2003-07-17 01:05:59.000000000 +0200
-+++ uspell/src/lookup2.cpp	2006-02-19 12:04:26.246857250 +0100
-@@ -206,7 +206,7 @@
-    c = initval;           /* the previous hash value */
- 
-    /*---------------------------------------- handle most of the key */
--   if (((ub4)k)&3)
-+   if (reinterpret_cast<unsigned long>(k) & 3)
-    {
-       while (len >= 12)    /* unaligned */
-       {
---- uspell/src/transcribe.cpp.orig	2003-07-17 01:06:00.000000000 +0200
-+++ uspell/src/transcribe.cpp	2006-02-19 12:40:55.003646000 +0100
-@@ -143,7 +143,8 @@
- 			aftSource = foreSource;
- 			current = &transcribeStart;
- 		} else { // no replacement; output one byte and rescan
--			*(reinterpret_cast<char *>(destPtr))++ = *aftSource++;
-+			*reinterpret_cast<char *>(destPtr) = *aftSource++;
-+			destPtr = reinterpret_cast<wide_t*>(reinterpret_cast<char *>(destPtr) + 1);
- 			foreSource = aftSource;
- 			current = &transcribeStart;
- 		}
---- uspell/src/uspell.h.orig	2003-07-24 02:20:04.000000000 +0200
-+++ uspell/src/uspell.h	2006-02-19 12:41:16.877013000 +0100
-@@ -136,7 +136,7 @@
- 			const wide_t *target, const int targetLength);
- 		int wordDiff(const wide_t *string1, const int string1Length,
- 			const wide_t *string2, const int string2Length);
--		void uSpell::acceptGoodWord(const utf8_t *buf, int wordPosition,
-+		void acceptGoodWord(const utf8_t *buf, int wordPosition,
- 			int fileNumber);
- }; // class uSpell
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/uspell.git/commitdiff/61acbe4fb4c9af53c24e8de79d936a7692ff48cf



More information about the pld-cvs-commit mailing list