- .spec file cleanup

.gitignore

@@ -1,3 +1 @@
-hspell-0.9.tar.gz
-hspell-1.0.tar.gz
 /hspell-1.2.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: hspell
-# $Id$
-NAME := hspell
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

hspell.spec

@@ -1,14 +1,13 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.2
-Release: 2%{?dist}
-URL: http://hspell.ivrix.org.il
-Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
+Release: 3%{?dist}
 License: AGPLv3
 Group: Applications/Text
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: zlib-devel hunspell-devel
-#Patch0: hspell-1.2.sharedlib.patch
+URL: http://hspell.ivrix.org.il/
+Source: http://hspell.ivrix.org.il/%{name}-%{version}.tar.gz
+
+BuildRequires: hunspell-devel, zlib-devel
 
 %description
 Hspell is a Hebrew SPELLer and morphological analyzer. It provides a mostly
@@ -23,7 +22,7 @@ Hspell הוא מאיית ומנתח צורני עברי, המספק מנשק ד
 המשמעויות האפשריות של מחרוזת אותיות עברית.
 
 %package devel
-Summary: Library and include files for Hspell, the hebrew spell checker
+Summary: Library and include files for Hspell, the Hebrew spell checker
 Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
 
@@ -43,7 +42,6 @@ Hebrew hunspell dictionaries.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .sharedlib.patch
 /usr/bin/iconv -f hebrew -t utf8 -o WHATSNEW WHATSNEW
 
 %build
@@ -52,8 +50,7 @@ make CFLAGS="$RPM_OPT_FLAGS" STRIP=:
 make hunspell
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libhspell.a
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
@@ -62,13 +59,9 @@ cp -p he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
 
 %check
 # there are three known failures
-! make test | grep FAILED | egrep -v '1/aspell/[489]'
-
-%clean
-rm -rf %{buildroot}
+! make test | grep FAILED | grep -E -v '1/aspell/[489]'
 
 %files
-%defattr(-,root,root)
 %doc LICENSE README WHATSNEW COPYING
 %{_bindir}/hspell
 %{_bindir}/hspell-i
@@ -78,13 +71,11 @@ rm -rf %{buildroot}
 %{_datadir}/hspell/
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/*.h
 %{_libdir}/libhspell.so
 %{_mandir}/man3/hspell.3*
 
 %files -n hunspell-he
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_datadir}/myspell/*
 
@@ -93,6 +84,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 12 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2-3
+- .spec file cleanup
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild