packages: libstemmer/libstemmer.spec, libstemmer/libtool-tag.patch (NEW), l...

[glen]

Author: glen                         Date: Sat Nov 21 12:38:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add libtool --tag, optflags. patches

---- Files affected:
packages/libstemmer:
   libstemmer.spec (1.3 -> 1.4) , libtool-tag.patch (NONE -> 1.1)  (NEW), optflags.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libstemmer/libstemmer.spec
diff -u packages/libstemmer/libstemmer.spec:1.3 packages/libstemmer/libstemmer.spec:1.4
--- packages/libstemmer/libstemmer.spec:1.3	Wed Oct 28 21:27:37 2009
+++ packages/libstemmer/libstemmer.spec	Sat Nov 21 13:38:31 2009
@@ -8,6 +8,8 @@
 Source0:	http://snowball.tartarus.org/dist/%{name}_c.tgz
 # Source0-md5:	530e491060442013e2c39d34275e4bfd
 Patch0:		%{name}-makefile.patch
+Patch1:		libtool-tag.patch
+Patch2:		optflags.patch
 URL:		http://snowball.tartarus.org/
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,11 +60,13 @@
 %prep
 %setup -q -n %{name}_c
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} \
-	CFLAGS="%{rpmcflags} -Iinclude -fPIC" \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/11/21 12:38:31  glen
+- add libtool --tag, optflags. patches
+
 Revision 1.3  2009/10/28 20:27:37  arekm
 - up to 20090915
 

================================================================
Index: packages/libstemmer/libtool-tag.patch
diff -u /dev/null packages/libstemmer/libtool-tag.patch:1.1
--- /dev/null	Sat Nov 21 13:38:37 2009
+++ packages/libstemmer/libtool-tag.patch	Sat Nov 21 13:38:31 2009
@@ -0,0 +1,33 @@
+--- 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

================================================================
Index: packages/libstemmer/optflags.patch
diff -u /dev/null packages/libstemmer/optflags.patch:1.1
--- /dev/null	Sat Nov 21 13:38:37 2009
+++ packages/libstemmer/optflags.patch	Sat Nov 21 13:38:31 2009
@@ -0,0 +1,10 @@
+--- 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libstemmer/libstemmer.spec?r1=1.3&r2=1.4&f=u