[bibletime] SPEC cleanup.

Christopher Meng cicku at fedoraproject.org
Tue Aug 5 08:52:56 UTC 2014


commit a8894903fc621c165e7b9d30234882f3c836cff1
Author: Christopher Meng <i at cicku.me>
Date:   Tue Aug 5 16:52:38 2014 +0800

    SPEC cleanup.

 bibletime.spec |   61 +++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/bibletime.spec b/bibletime.spec
index 8216b21..4537b39 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,49 +1,48 @@
-Summary:	An easy to use Bible study tool
-Name:		bibletime
-Version:	2.10.1
-Release:	2%{?dist}
-License:	GPLv2
-Url:		http://www.bibletime.info/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-
+Name:           bibletime
+Version:        2.10.1
+Release:        2%{?dist}
+Summary:        An easy to use Bible study tool
+License:        GPLv2
+URL:            http://www.bibletime.info/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 # Replaces -fpie with -fPIE to fix build on s390
-Patch0: flags.patch
-
-BuildRequires:	cmake
-BuildRequires:	pkgconfig(QtGui) >= 4.5.0
-BuildRequires:	pkgconfig(QtDBus) pkgconfig(QtXml)
-BuildRequires:	pkgconfig(QtWebKit)
-BuildRequires:	sword-devel >= 1.7.0 clucene-core-devel >= 2.0
-BuildRequires:	boost-devel openssl-devel dbus-devel
-BuildRequires:	desktop-file-utils gettext
+Patch0:         flags.patch
+BuildRequires:  boost-devel
+BuildRequires:  clucene-core-devel >= 2.0
+BuildRequires:  cmake
+BuildRequires:  dbus-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig(QtGui) >= 4.5.0
+BuildRequires:  pkgconfig(QtDBus)
+BuildRequires:  pkgconfig(QtXml)
+BuildRequires:  pkgconfig(QtWebKit)
+BuildRequires:  sword-devel >= 1.7.0
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
-BibleTime is a free and easy to use cross-platform bible study tool.
-
-BibleTime provides easy handling of digitalized texts (Bibles,
-commentaries and lexicons) and powerful features to work with these
-texts (search in texts, write own notes, save, print etc.).
-BibleTime is a frontend for the SWORD Bible Framework.
+BibleTime is a free and easy to use cross-platform bible study tool. It 
+provides easy handling of digitalized texts (Bibles, commentaries and 
+lexicons) and powerful features to work with these texts (search in 
+texts, write own notes, save, print etc.). BibleTime is a frontend for 
+the SWORD Bible Framework.
 
 %prep
 %setup -q
-
 %patch0 -p1 -b .flags
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} \
-  -DCMAKE_BUILD_TYPE=Release \
-  ..
+%cmake ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%make_install -C %{_target_platform}
 
 # rename wrongly-named locale
 mv %{buildroot}%{_datadir}/%{name}/locale/bibletime_ui_pt_{br,BR}.qm || :
@@ -63,6 +62,7 @@ done
 desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
 
 %files -f %{name}.lang
+%doc ChangeLog LICENSE README
 %{_bindir}/bibletime
 %{_datadir}/applications/bibletime.desktop
 %dir %{_datadir}/%{name}
@@ -70,13 +70,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
 %dir %{_datadir}/%{name}/docs/handbook/
 %dir %{_datadir}/%{name}/docs/howto/
 %{_datadir}/%{name}/display-templates/
+%{_datadir}/%{name}/icons/
 %{_datadir}/%{name}/javascript/
 %{_datadir}/%{name}/license/
-%{_datadir}/%{name}/icons/
 %{_datadir}/%{name}/locale/
 %{_datadir}/%{name}/pics/
 %{_datadir}/icons/bibletime.svg
-%doc ChangeLog README LICENSE
 
 %changelog
 * Wed Jul 09 2014 Jakub Čajka <jcajka at redhat.com> - 2.10.1-2


More information about the scm-commits mailing list