rpms/gnomesword/FC-6 gnomesword.spec,1.18,1.19

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/gnomesword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8364

Modified Files:
	gnomesword.spec 
Log Message:
* Sat Feb 24 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.2.1-1
- New release



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/gnomesword.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnomesword.spec	29 Jan 2007 00:00:32 -0000	1.18
+++ gnomesword.spec	24 Feb 2007 23:14:48 -0000	1.19
@@ -1,26 +1,26 @@
-Name:           gnomesword           
-Version:        2.2.1
-Release:        1%{?dist}
-Summary:        GNOME-based Bible research tool
-
-Group:          Applications/Text
-License:        GPL
-URL:            http://gnomesword.sourceforge.net/
-Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  sword-devel >= 1.5.9
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-BuildRequires:  gnome-doc-utils
-BuildRequires:  gtkhtml3-devel >= 3.6
-BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
-BuildRequires:  perl(XML::Parser)
-Requires(post):   scrollkeeper
-Requires(postun): scrollkeeper
-Obsoletes:      gnomesword2
-Provides:       gnomesword2
+Name:		gnomesword           
+Version:	2.2.2.1
+Release:	1%{?dist}
+Summary:	GNOME-based Bible research tool
+
+Group:		Applications/Text
+License:	GPL
+URL:		http://gnomesword.sourceforge.net/
+Source0:	http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	sword-devel >= 1.5.9
+BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gnome-doc-utils
+BuildRequires:	gtkhtml3-devel >= 3.6
+BuildRequires:	libgnomeui-devel libgnomeprintui22-devel
+BuildRequires:	scrollkeeper
+BuildRequires:	perl(XML::Parser)
+Requires(post):	scrollkeeper
+Requires(postun):	scrollkeeper
+Obsoletes:	gnomesword2
+Provides:	gnomesword2
 
 %description
 Gnomesword is a Bible study application for GNOME, a graphical desktop
@@ -34,21 +34,21 @@
 
 %build
 %configure
-#make %{?_smp_mflags} //fail to build with this
+#make %{?_smp_mflags} : // Doesn't seem to work on i386
 make
 
 %install
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 
-desktop-file-install %buildroot%_datadir/applications/gnomesword.desktop \
---vendor=fedora \
---remove-category=X-Red-Hat-Extra \
---remove-category=Application \
---add-category=Other \
---dir=%buildroot%_datadir/applications \
---copy-name-to-generic-name \
---delete-original
+desktop-file-install --delete-original \
+	--vendor=fedora \
+	--remove-category=X-Red-Hat-Extra \
+	--remove-category=Application \
+	--add-category=Other \
+	--dir=%buildroot%_datadir/applications \
+	--copy-name-to-generic-name \
+	%buildroot%_datadir/applications/gnomesword.desktop
 
 # package docs with macro
 rm -rf %buildroot%_datadir/doc/%{name}
@@ -58,9 +58,11 @@
 %clean
 rm -rf %buildroot
 
-%post -p /usr/bin/scrollkeeper-update
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -71,8 +73,10 @@
 %_datadir/applications/fedora-gnomesword.desktop
 %_datadir/gnome/help/gnomesword/
 
-
 %changelog
+* Sat Feb 24 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.2.1-1
+- New release
+
 * Sun Jan 28 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.1-1
 - Remove un-neccesary gnome-spell and icu BRs