rpms/sword/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sword.spec, 1.16, 1.17

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/sword/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20003

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.6.0-1
- Build for EPEL5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Nov 2006 18:43:32 -0000	1.4
+++ .cvsignore	27 Oct 2009 04:26:14 -0000	1.5
@@ -1 +1 @@
-sword-1.5.9.tar.gz
+sword-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Nov 2006 18:43:32 -0000	1.4
+++ sources	27 Oct 2009 04:26:14 -0000	1.5
@@ -1 +1 @@
-e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz
+292ca38b2427168b19d629b48a428dde  sword-1.6.0.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/sword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sword.spec	20 Jan 2007 16:06:31 -0000	1.16
+++ sword.spec	27 Oct 2009 04:26:14 -0000	1.17
@@ -1,20 +1,20 @@
 Name:           sword           
-Version:        1.5.9
-Release:        4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libicu-devel icu
 BuildRequires:  clucene-core-devel
+BuildRequires:  cppunit-devel
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -42,20 +42,21 @@ that uses the sword API, such as Gnomesw
 %setup -q
 
 %build
-%configure --disable-static --with-icu --with-lucene
-make 
-#%%{?_smp_mflags} sometimes causes build failure
+%configure --disable-static --with-icu
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+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 %{buildroot}%{_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
@@ -67,21 +68,23 @@ rm -rf %buildroot
 %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 Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.6.0-1
+- Build for EPEL5
+
 * Sat Jan 20 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-4
 - Fix an error (libicu-devel not icu-devel)