[arch-commits] Commit in hspell/trunk (PKGBUILD hspell-1.0.sharedlib.patch)

[Jan de Groot]

    Date: Monday, August 27, 2012 @ 05:42:15
  Author: jgc
Revision: 165611

upgpkg: hspell 1.2-1

Update to 1.2, remove patch for sharedlibs, as 1.2 includes --enable-shared now

Modified:
  hspell/trunk/PKGBUILD
Deleted:
  hspell/trunk/hspell-1.0.sharedlib.patch

----------------------------+
 PKGBUILD                   |   20 +++++--------
 hspell-1.0.sharedlib.patch |   66 -------------------------------------------
 2 files changed, 8 insertions(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-27 09:02:59 UTC (rev 165610)
+++ PKGBUILD	2012-08-27 09:42:15 UTC (rev 165611)
@@ -3,25 +3,21 @@
 
 pkgbase=hspell
 pkgname=('hspell' 'hunspell-he')
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
 makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk')
 options=('!libtool' '!makeflags')
-source=(http://hspell.ivrix.org.il/${pkgname}-${pkgver}.tar.gz
-	hspell-1.0.sharedlib.patch)
-md5sums=('e79e75180ce529c008ea085954a52f2c'
-         '0df6764bb37500ee936b9355fee0c7a5')
+source=(http://hspell.ivrix.org.il/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('32fbc1a71e86ab46bf7870c6eec9a6be'
+         '858120037dd52ae823788518329ee7d3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/hspell-1.0.sharedlib.patch
-  autoreconf -v
-  sed -i -e 's|/usr/bin/awk|/bin/awk|' wzip
   ./configure --prefix=/usr --mandir=/usr/share/man \
-      --enable-linginfo --enable-fatverb
+      --enable-linginfo --enable-fatverb --enable-shared
   make 
   make hunspell
 }
@@ -44,8 +40,8 @@
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 hunspell/new_he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic
-  install -m644 hunspell/new_he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff
+  install -m644 he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic
+  install -m644 he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff
 
   # the symlinks
   install -dm755 ${pkgdir}/usr/share/myspell/dicts

Deleted: hspell-1.0.sharedlib.patch
===================================================================
--- hspell-1.0.sharedlib.patch	2012-08-27 09:02:59 UTC (rev 165610)
+++ hspell-1.0.sharedlib.patch	2012-08-27 09:42:15 UTC (rev 165611)
@@ -1,66 +0,0 @@
-Index: hspell-1.0/Makefile.in
-===================================================================
---- hspell-1.0.orig/Makefile.in
-+++ hspell-1.0/Makefile.in
-@@ -51,7 +51,7 @@ LDFLAGS=@LDFLAGS@
- 
- # Our TARGETS variable chooses what to compile. Some things are
- # optionally compiled depending on --enable-* paramters to configure.
--TARGETS = @TARGETS@
-+TARGETS = @TARGETS@ libhspell.a
- all: $(TARGETS)
- 
- # SEDCMD controls on whether objective-kinuyim - about 130,000 rare verb
-@@ -76,7 +76,8 @@ clean:
- 	      hebrew.wgz.lingsizes.tmp dmask.c install.js \
- 	      spell-he.xpi he.dic he.aff README-he.txt \
- 	      README_he_IL.txt he_IL.dic he_IL.aff he_IL.zip \
--	      specfilter.o specfilter
-+	      specfilter.o specfilter \
-+	      libhspell.so.0 libhspell.so *.lo
- 	rm -f hebeng/install.js hebeng/heb-eng.aff hebeng/heb-eng.dic \
- 	      hebeng/README-he.txt hebeng/README-en-US.txt \
- 	      hebeng/spell-heb-eng.xpi
-@@ -113,6 +114,9 @@ install: all
- 	test -d $(DESTDIR)$(LIBDIR) || mkdir -m 755 -p $(DESTDIR)$(LIBDIR)
- 	cp libhspell.a $(DESTDIR)$(LIBDIR)/
- 	chmod 644 $(DESTDIR)$(LIBDIR)/libhspell.a
-+	cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/
-+	chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0
-+	ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so
- 	test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR)
- 	cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/
- 	chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h
-@@ -166,19 +170,30 @@ libhspell.a: dict_radix.o gimatria.o cor
- 	ar cr $@ $^
- 	-ranlib $@
- 
--$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.a $(LIBS)
-+EXTRAOBJECTSPIC=$(EXTRAOBJECTS:.o=.lo)
-+
-+%.lo: %.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -o $@ $<
-+
-+libhspell.so.0: dict_radix.lo gimatria.lo corlist.lo libhspell.lo $(EXTRAOBJECTSPIC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,libhspell.so.0 $^ -lz
-+	ln -sf libhspell.so.0 libhspell.so
-+
-+$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.so.0
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.so.0 $(LIBS)
- 
- # remember to update this dependency list once in a while...
- libhspell.o dict_radix.o find_sizes.o: dict_radix.h
- dict_radix.o linginfo.o: gzbuffered.h
- libhspell.o mk_he_affix.o: prefixes.c
-+libhspell.lo mk_he_affix.lo: prefixes.c
- hspell.o: hash.h tclHash.h
- tclHash.o: tclHash.h
- corlist.o gimatria.o hspell.o libhspell.o: hspell.h
- hspell.o libhspell.o linginfo.o: linginfo.h hspell.h
- linginfo.o: dmask.c
- specfilter.o: prefixes.c
-+specfilter.lo: prefixes.c
- 
- prefixes.c: genprefixes.pl PrefixBits.pl
- 	$(PERL) -w ./genprefixes.pl >prefixes.c