From 96d329d7e3ddc63d6be112643ad50c3417cc09ac Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Aug 05 2014 08:46:17 +0000
Subject: SPEC cleanup


---

diff --git a/sword.spec b/sword.spec
index f9699ed..424a33a 100644
--- a/sword.spec
+++ b/sword.spec
@@ -1,19 +1,18 @@
 Name:           sword           
 Version:        1.7.3
-Release:        2%{?dist}
+Release:        3%{?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.7/sword-%{version}.tar.gz
-BuildRequires:  openssl-devel
-BuildRequires:  curl-devel
-BuildRequires:  zlib-devel
-BuildRequires:  libidn-devel
-BuildRequires:  libicu-devel icu
 BuildRequires:  clucene-core-devel
 BuildRequires:  cppunit-devel
+BuildRequires:  curl-devel
+BuildRequires:  icu
+BuildRequires:  libicu-devel
+BuildRequires:  libidn-devel
+BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -24,18 +23,16 @@ also create Bible study software for all readers, students, scholars,
 and translators of the Bible, and have a growing collection of over 200
 texts in over 50 languages.
 
-%package devel
-Summary:  Development files for the sword project
-Group:    Development/Libraries
-Requires: %{name} = %{version}
-Requires: pkgconfig
-Requires: curl-devel clucene-core-devel libicu-devel
-
-%description devel
-This package contains the development headers and libraries for the
-sword API. You need this package if you plan on compiling software
-that uses the sword API, such as Gnomesword or Bibletime.
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       clucene-core-devel%{?_isa}
+Requires:       curl-devel%{?_isa}
+Requires:       libicu-devel%{?_isa}
 
+%description    devel
+This package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -44,37 +41,36 @@ that uses the sword API, such as Gnomesword or Bibletime.
 %configure --disable-static --with-icu --with-clucene=%{_prefix}
 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}
-
+%make_build
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 mkdir -p %{buildroot}%{_datadir}/sword/modules
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
+%doc AUTHORS COPYING ChangeLog LICENSE NEWS README
 %doc samples doc
 %config(noreplace) %{_sysconfdir}/sword.conf
 %{_bindir}/*
+%{_datadir}/sword/
 %{_libdir}/libsword-%{version}.so
-%{_datadir}/sword
 
 %files devel
-%defattr(-,root,root,-)
 %doc CODINGSTYLE
-%{_includedir}/sword
-%{_libdir}/pkgconfig/sword.pc
+%{_includedir}/sword/
 %{_libdir}/libsword.so
+%{_libdir}/pkgconfig/sword.pc
 
 %changelog
+* Sat Aug 02 2014 Christopher Meng <rpm@cicku.me> - 1.7.3-3
+- devel subpkg cleanup
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild