rpms/sword/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sword.spec, 1.22, 1.23

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/sword/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1334

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Mon May 26 2008 Deji Akingunola <dakingun at gmail.com> - 1.5.11-1
- Update to version 1.5.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Nov 2007 12:11:03 -0000	1.5
+++ .cvsignore	27 May 2008 02:18:02 -0000	1.6
@@ -1 +1 @@
-sword-1.5.10.tar.gz
+sword-1.5.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Nov 2007 12:11:03 -0000	1.5
+++ sources	27 May 2008 02:18:02 -0000	1.6
@@ -1 +1 @@
-4c920f2a3ee72040df8a8e105ad840df  sword-1.5.10.tar.gz
+84a13fd3cf767902de91368424f30baa  sword-1.5.11.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/F-9/sword.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sword.spec	21 Feb 2008 07:58:22 -0000	1.22
+++ sword.spec	27 May 2008 02:18:02 -0000	1.23
@@ -1,14 +1,12 @@
 Name:           sword           
-Version:        1.5.10
-Release:        3%{?dist}
+Version:        1.5.11
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Patch0:		sword-gcc43.patch
-Patch1:		sword-diatheke.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
@@ -41,24 +39,21 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gcc43
-%patch1 -p0 -b .diat
 
 %build
 %configure --disable-static --with-icu --with-lucene
-make 
-#%%{?_smp_mflags} sometimes causes build failure
+make %{?_smp_mflags}
 
 
 %install
-rm -rf %buildroot
-make install DESTDIR=%buildroot
-%__mkdir_p %buildroot%_datadir/sword/modules
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+mkdir -p %{_datadir}/sword/modules
 
-find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
-rm -rf %buildroot
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -70,21 +65,23 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
 %doc samples doc
-%config(noreplace) %_sysconfdir/sword.conf
-%_bindir/*
-%_libdir/sword/
-%_libdir/libsword-%{version}.so
-%_datadir/sword
+%config(noreplace) %{_sysconfdir}/sword.conf
+%{_bindir}/*
+%{_libdir}/sword/
+%{_libdir}/libsword-%{version}.so
+%{_datadir}/sword
 
 %files devel
 %defattr(-,root,root,-)
 %doc CODINGSTYLE
-%_includedir/sword
-%_libdir/pkgconfig/sword.pc
-%_libdir/libsword.so
-
+%{_includedir}/sword
+%{_libdir}/pkgconfig/sword.pc
+%{_libdir}/libsword.so
 
 %changelog
+* Mon May 26 2008 Deji Akingunola <dakingun at gmail.com> - 1.5.11-1
+- Update to version 1.5.11
+
 * Thu Feb 21 2008 Deji Akingunola <dakingun at gmail.com> - 1.5.10-3
 - Fix command injection bug (Bug #433723)