- release 2

[packages/sword.git] / sword.spec

diff --git a/sword.spec b/sword.spec
index ae9ca029ddfcc592c6dec66a7d6e026e70f7520d..dc5a669f86ce950db3eaacdb40570a8ee8a1366e 100644 (file)
--- a/sword.spec
+++ b/sword.spec
@@ -1,36 +1,37 @@
-#
 # TODO:
-# - Split out subpackages for tests, examples
-# - Fix debug package. Patch Makefile so debugfiles.list is generated?
 # - Package icu-sword and add bcond for it here
 #
-%define debug_package 0
-
-%bcond_with            examples
+# Conditional build:
 #%bcond_with   icusword
-%bcond_with            tests
 %bcond_without clucene
 %bcond_without curl
 %bcond_without icu
 %bcond_without utilities
 
+%define debug_package 0
+
 Summary:       The SWORD Project framework for manipulating Bible texts
 Name:          sword
-Version:       1.6.1
+Version:       1.6.2
 Release:       2
 License:       GPL
 Group:         Libraries
 Source0:       http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/%{name}-%{version}.tar.gz
-# Source0-md5: 347e72f73313ff3ba700368db76a5d50
+# Source0-md5: a7dc4456e20e915fec46d774b690e305
+Patch0:                %{name}-curl.patch
 URL:           http://www.crosswire.org/sword
+BuildRequires: pkgconfig
+BuildRequires: xulrunner-devel >= 1.9.2.3
 %{?with_clucene:BuildRequires: clucene-core-devel}
 %{?with_clucene:Requires:      clucene-core}
 %{?with_curl:BuildRequires:    curl-devel}
 %{?with_curl:Requires: curl}
 %{?with_icu:BuildRequires:     icu}
+%{?with_icu:BuildRequires:     libicu-devel}
 %{?with_icu:Requires:  icu}
 #%{?with_icusword:BuildRequires:       icu-sword}
 #%{?with_icusword:Requires:    icu-sword}
+Requires:      xulrunner >= 1.9.2.3
 Requires:      zlib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,17 +65,21 @@ This package is required to compile Sword frontends, too.
 
 %prep
 %setup -q
+%if %{with_curl}
+%patch0 -p0
+%endif
 
 %build
 %{configure} \
+       --with-conf \
        --with%{!?with_clucene:out}-clucene \
        --with%{!?with_curl:out}-curl \
        --with%{!?with_icu:out}-icu \
-       --%{?with_utilities:en}%{!?with_utilities:dis}able-utilities \
-       --%{?with_tests:en}%{!?with_tests:dis}able-tests \
-       --with-conf \
        --disable-debug \
-       --disable-dependency-tracking
+       --disable-dependency-tracking \
+       --disable-examples \
+       --disable-tests \
+       --%{?with_utilities:en}%{!?with_utilities:dis}able-utilities \
        #--with%{!?with_icusword:out}-icusword \
 
 %{__make}