commit eac6ac2e7bd73d38a243ef1dead5a941b1ef5287
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 14 13:06:09 2024 +0200
- updated to 2.2.0, epoch 1
libstemmer-makefile.patch | 33 +++++++++++++++++----------------
libstemmer.spec | 18 +++++++++---------
2 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/libstemmer.spec b/libstemmer.spec
index ca1a3b1..4e50269 100644
--- a/libstemmer.spec
+++ b/libstemmer.spec
@@ -1,16 +1,17 @@
Summary: The C version of the libstemmer library
Summary(pl.UTF-8): Wersja C biblioteki libstemmer
Name: libstemmer
-Version: 20191002
+Version: 2.2.0
Release: 1
+Epoch: 1
License: BSD
Group: Libraries
#Source0Download: https://snowballstem.org/download.html
-Source0: https://snowballstem.org/dist/%{name}_c.tgz
-# Source0-md5: f8288a861db7c97dc4750020c7c7aa6f
+Source0: https://snowballstem.org/dist/%{name}_c-%{version}.tar.gz
+# Source0-md5: a0add7c0ebdd8d18872a31199bf37f4d
Patch0: %{name}-makefile.patch
-URL: http://snowballstem.org/
-BuildRequires: libtool
+URL: https://snowballstem.org/
+BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -28,7 +29,7 @@ wykorzystywanych przy wyszukiwaniu informacji.
Summary: Header files for libstemmer library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libstemmer
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
Header files for libstemmer library.
@@ -40,7 +41,7 @@ Pliki nagłówkowe biblioteki libstemmer.
Summary: Static libstemmer library
Summary(pl.UTF-8): Statyczna biblioteka libstemmer
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description static
Static libstemmer library.
@@ -60,8 +61,7 @@ The stemwords utility using the libstemmer library
Narzędzie stemwords korzystające z biblioteki libstemmer.
%prep
-%setup -qc
-%{__mv} %{name}_c/* .
+%setup -q -n %{name}_c-%{version}
%patch0 -p1
%build
diff --git a/libstemmer-makefile.patch b/libstemmer-makefile.patch
index 4619db8..1373126 100644
--- a/libstemmer-makefile.patch
+++ b/libstemmer-makefile.patch
@@ -1,17 +1,18 @@
---- 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
+--- libstemmer_c-2.2.0/Makefile.orig 2024-09-14 12:50:10.978761983 +0200
++++ libstemmer_c-2.2.0/Makefile 2024-09-14 12:55:31.260360202 +0200
+@@ -2,12 +2,47 @@ include mkinc.mak
+ ifeq ($(OS),Windows_NT)
+ EXEEXT=.exe
+ endif
-CFLAGS=-O2
--CPPFLAGS=-Iinclude
--all: libstemmer.o stemwords
--libstemmer.o: $(snowball_sources:.c=.o)
-- $(AR) -cru $@ $^
--stemwords: examples/stemwords.o libstemmer.o
-- $(CC) $(CFLAGS) -o $@ $^
+CFLAGS?=-O2
+CFLAGS+=-D_REENTRANT
-+CPPFLAGS+=-Iinclude
+ CPPFLAGS=-Iinclude
+-all: libstemmer.a stemwords$(EXEEXT)
+-libstemmer.a: $(snowball_sources:.c=.o)
+- $(AR) -cru $@ $^
+-stemwords$(EXEEXT): examples/stemwords.o libstemmer.a
+- $(CC) $(CFLAGS) -o $@ $^
+
+bindir=/usr/bin
+libdir=/usr/lib
@@ -22,19 +23,19 @@
+INSTALL=install -c
+
+LT_CURRENT=1
-+LT_REVISION=0
++LT_REVISION=2
+LT_AGE=1
+
+LTOBJS:= $(snowball_sources:.c=.lo)
+
-+all: libstemmer.la stemwords
++all: libstemmer.la stemwords$(EXEEXT)
+
+libstemmer.la: $(LTOBJS)
+ $(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
++stemwords$(EXEEXT): examples/stemwords.o libstemmer.la
+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^
+
+%.lo: %.c
@@ -51,6 +52,6 @@
+ $(INSTALL) -m 644 include/libstemmer.h
$(DESTDIR)$(includedir)/libstemmer
+
clean:
-+ rm -f *.o *.lo *.a *.la
+- rm -f stemwords$(EXEEXT) libstemmer.a *.o src_c/*.o examples/*.o
runtime/*.o libstemmer/*.o
++ rm -f stemwords$(EXEEXT) libstemmer.la *.o *.lo src_c/*.o examples/*.o
runtime/*.o libstemmer/*.o
+ rm -rf .libs
- rm -f stemwords *.o src_c/*.o examples/*.o runtime/*.o libstemmer/*.o
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libstemmer.git/commitdiff/eac6ac2e7bd73d38a243ef1dead5a941b1ef5287
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
