[packages/libstemmer] - updated to 20191002 (aka 2.0.0) - updated makefile patch; libtool-tag,optflags patches now obsolet
qboosh
qboosh at pld-linux.org
Sun Jan 10 20:28:37 CET 2021
commit fd675f778d8b416108f28d9294acdfa014c5beac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 10 20:28:40 2021 +0100
- updated to 20191002 (aka 2.0.0)
- updated makefile patch; libtool-tag,optflags patches now obsolete
libstemmer-makefile.patch | 55 +++++++++++++++++++++--------------------------
libstemmer.spec | 27 +++++++++++------------
libtool-tag.patch | 33 ----------------------------
optflags.patch | 10 ---------
4 files changed, 38 insertions(+), 87 deletions(-)
---
diff --git a/libstemmer.spec b/libstemmer.spec
index 15fdb02..ca1a3b1 100644
--- a/libstemmer.spec
+++ b/libstemmer.spec
@@ -1,15 +1,14 @@
Summary: The C version of the libstemmer library
Summary(pl.UTF-8): Wersja C biblioteki libstemmer
Name: libstemmer
-Version: 20141109
-Release: 3
+Version: 20191002
+Release: 1
License: BSD
Group: Libraries
-Source0: http://snowball.tartarus.org/dist/%{name}_c.tgz
-# Source0-md5: 6f32f8f81cd6fa0150333ab540af5e27
+#Source0Download: https://snowballstem.org/download.html
+Source0: https://snowballstem.org/dist/%{name}_c.tgz
+# Source0-md5: f8288a861db7c97dc4750020c7c7aa6f
Patch0: %{name}-makefile.patch
-Patch1: libtool-tag.patch
-Patch2: optflags.patch
URL: http://snowballstem.org/
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,16 +61,16 @@ Narzędzie stemwords korzystające z biblioteki libstemmer.
%prep
%setup -qc
-mv %{name}_c/* .
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%{__mv} %{name}_c/* .
+%patch0 -p1
%build
+CFLAGS="%{rpmcflags}" \
+CPPFLAGS="%{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
%{__make} \
CC="%{__cc}" \
- libdir=%{_libdir} \
- OPTFLAGS="%{rpmcflags}"
+ libdir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
@@ -88,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
+%doc COPYING NEWS README
%attr(755,root,root) %{_libdir}/libstemmer.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libstemmer.so.0
@@ -96,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libstemmer.so
%{_libdir}/libstemmer.la
-%{_includedir}/%{name}
+%{_includedir}/libstemmer
%files static
%defattr(644,root,root,755)
diff --git a/libstemmer-makefile.patch b/libstemmer-makefile.patch
index 601a85b..4619db8 100644
--- a/libstemmer-makefile.patch
+++ b/libstemmer-makefile.patch
@@ -1,47 +1,44 @@
---- Makefile 2006-01-24 00:08:08.000000000 +0100
-+++ Makefile.oden 2006-02-05 13:18:24.000000000 +0100
-@@ -1,9 +1,52 @@
+--- libstemmer-20191002/Makefile.orig 2021-01-10 19:00:35.687893830 +0100
++++ libstemmer-20191002/Makefile 2021-01-10 19:21:01.394586941 +0100
+@@ -1,10 +1,46 @@
include mkinc.mak
--CFLAGS=-Iinclude
+-CFLAGS=-O2
+-CPPFLAGS=-Iinclude
-all: libstemmer.o stemwords
-libstemmer.o: $(snowball_sources:.c=.o)
- $(AR) -cru $@ $^
-stemwords: examples/stemwords.o libstemmer.o
-- $(CC) -o $@ $^
-+CFLAGS+=-Wall -Iinclude -fPIC -DPIC -D_REENTRANT
-+CC=gcc
-+bindir = /usr/bin
-+libdir = /usr/lib
-+includedir = /usr/include
-+DESTDIR =
-+
-+AR = ar
-+RANLIB = ranlib
-+LIBTOOL = libtool
-+INSTALL = install -c
-+LDFLAGS =
-+
-+LT_CURRENT=0
+- $(CC) $(CFLAGS) -o $@ $^
++CFLAGS?=-O2
++CFLAGS+=-D_REENTRANT
++CPPFLAGS+=-Iinclude
++
++bindir=/usr/bin
++libdir=/usr/lib
++includedir=/usr/include
++DESTDIR=
++
++LIBTOOL=libtool
++INSTALL=install -c
++
++LT_CURRENT=1
+LT_REVISION=0
-+LT_AGE=0
++LT_AGE=1
+
-+LTOBJS:= $(snowball_sources:.c=.o)
++LTOBJS:= $(snowball_sources:.c=.lo)
+
+all: libstemmer.la stemwords
+
+libstemmer.la: $(LTOBJS)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) \
++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) -rpath $(libdir) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o \
+ $@ $(LTOBJS)
+
+stemwords: examples/stemwords.o libstemmer.la
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
-+
-+%.o: %.c
-+ $(CC) -c $(CFLAGS) $< -o $@
++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
+
+%.lo: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+install:
+ $(INSTALL) -d $(DESTDIR)$(bindir)
@@ -49,7 +46,6 @@
+ $(INSTALL) -d $(DESTDIR)$(includedir)/libstemmer
+ $(LIBTOOL) --mode=install $(INSTALL) libstemmer.la $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 stemwords $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 644 libstemmer/modules.h $(DESTDIR)$(includedir)/libstemmer
+ $(INSTALL) -m 644 runtime/api.h $(DESTDIR)$(includedir)/libstemmer
+ $(INSTALL) -m 644 runtime/header.h $(DESTDIR)$(includedir)/libstemmer
+ $(INSTALL) -m 644 include/libstemmer.h $(DESTDIR)$(includedir)/libstemmer
@@ -57,5 +53,4 @@
clean:
+ rm -f *.o *.lo *.a *.la
+ rm -rf .libs
- rm -f stemwords *.o src_c/*.o runtime/*.o libstemmer/*.o
-+
+ rm -f stemwords *.o src_c/*.o examples/*.o runtime/*.o libstemmer/*.o
diff --git a/libtool-tag.patch b/libtool-tag.patch
deleted file mode 100644
index b43cb6a..0000000
--- a/libtool-tag.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libstemmer_c/Makefile~ 2009-11-21 14:34:37.000000000 +0200
-+++ libstemmer_c/Makefile 2009-11-21 14:35:39.761787074 +0200
-@@ -21,25 +21,25 @@
- all: libstemmer.la stemwords
-
- libstemmer.la: $(LTOBJS)
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) \
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -rpath $(libdir) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o \
- $@ $(LTOBJS)
-
- stemwords: examples/stemwords.o libstemmer.la
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
-
- %.o: %.c
- $(CC) -c $(CFLAGS) $< -o $@
-
- %.lo: %.c
-- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
-+ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@
-
- install:
- $(INSTALL) -d $(DESTDIR)$(bindir)
- $(INSTALL) -d $(DESTDIR)$(libdir)
- $(INSTALL) -d $(DESTDIR)$(includedir)/libstemmer
-- $(LIBTOOL) --mode=install $(INSTALL) libstemmer.la $(DESTDIR)$(libdir)
-- $(LIBTOOL) --mode=install $(INSTALL) -m 755 stemwords $(DESTDIR)$(bindir)
-+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) libstemmer.la $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) -m 755 stemwords $(DESTDIR)$(bindir)
- $(INSTALL) -m 644 libstemmer/modules.h $(DESTDIR)$(includedir)/libstemmer
- $(INSTALL) -m 644 runtime/api.h $(DESTDIR)$(includedir)/libstemmer
- $(INSTALL) -m 644 runtime/header.h $(DESTDIR)$(includedir)/libstemmer
diff --git a/optflags.patch b/optflags.patch
deleted file mode 100644
index 02a88b0..0000000
--- a/optflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libstemmer_c/Makefile~ 2009-11-21 14:36:24.000000000 +0200
-+++ libstemmer_c/Makefile 2009-11-21 14:37:22.059947733 +0200
-@@ -1,5 +1,6 @@
- include mkinc.mak
--CFLAGS+=-Wall -Iinclude -fPIC -DPIC -D_REENTRANT
-+OPTFLAGS = -Wall
-+CFLAGS+= $(OPTFLAGS) -Iinclude -fPIC -DPIC -D_REENTRANT
- CC=gcc
- bindir = /usr/bin
- libdir = /usr/lib
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libstemmer.git/commitdiff/fd675f778d8b416108f28d9294acdfa014c5beac
More information about the pld-cvs-commit
mailing list