rpms/gnomesword/devel gnomesword.spec,1.1,1.2

[Michael A. Peters (mpeters)]

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30051/devel

Modified Files:
	gnomesword.spec 
Log Message:
Fixed packaging errors



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnomesword.spec	7 Jun 2005 12:04:31 -0000	1.1
+++ gnomesword.spec	9 Jun 2005 13:45:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -9,6 +9,7 @@
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  sed >= 3.95
 BuildRequires:  sword-devel >= 1.5.8
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
@@ -20,6 +21,7 @@
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
+Provides:       gnomesword2
 
 %description
 Gnomesword is a Bible study application for GNOME, a graphical desktop
@@ -30,7 +32,8 @@
 
 %prep
 %setup -q 
-
+%{__sed} -i 's?\r??' doc/help/C/legal.xml
+%{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
 %configure
@@ -47,6 +50,7 @@
 --vendor=fedora \
 --add-category=X-Fedora \
 --dir=%buildroot%_datadir/applications \
+--copy-name-to-generic-name \
 --delete-original
 
 # package docs with macro
@@ -73,5 +77,9 @@
 
 
 %changelog
+* Thu Jun 09 2005 Michael A. Peters <mpeters at mac.com> - 2.1.2-2
+- added --copy-name-to-generic-name to desktop-file-install
+- fixed line break packaging error
+
 * Mon Jun 06 2005 Michael A. Peters <mpeters at mac.com> - 2.1.2-1
 - Initial cvs checkin for Fedora Extras