packages: xiphos/xiphos.spec - adapter, scrollkeeper deps from PLD-doc/Buil...
glen
glen at pld-linux.org
Sat May 22 21:47:43 CEST 2010
Author: glen Date: Sat May 22 19:47:42 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- adapter, scrollkeeper deps from PLD-doc/BuildRequires.txt, plant todos
---- Files affected:
packages/xiphos:
xiphos.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/xiphos/xiphos.spec
diff -u packages/xiphos/xiphos.spec:1.5 packages/xiphos/xiphos.spec:1.6
--- packages/xiphos/xiphos.spec:1.5 Fri May 21 22:13:06 2010
+++ packages/xiphos/xiphos.spec Sat May 22 21:47:37 2010
@@ -1,16 +1,11 @@
# $Revision$, $Date$
-#
-# TODO:
-# - PLDify post/postun scrollkeper updates?
-#
-
Summary: GNOME-based Bible research tool
Name: xiphos
Version: 3.1.3
-Release: 0.1
+Release: 0.1
License: GPL
Group: X11/Applications
-URL: http://xiphos.org
+URL: http://www.xiphos.org/
Source0: http://downloads.sourceforge.net/gnomesword/Xiphos/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: aaded6bc81b29935edd989d204928ba3
BuildRequires: clucene-core-devel
@@ -18,8 +13,10 @@
BuildRequires: gtkhtml-devel >= 3.0
BuildRequires: libbonobo-devel >= 2.0
BuildRequires: libgnomeui-devel >= 2.2
+BuildRequires: rpmbuild(macros) >= 1.198
BuildRequires: scrollkeeper >= 0.3.5
BuildRequires: sword-devel >= 1.6.1
+Requires(post,postun): scrollkeeper
Requires: clucene-core
Requires: gtkhtml >= 3.0
Requires: libbonobo >= 2.0
@@ -49,6 +46,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# scratch this and instead use %doc relative to files in builddir, not full path to installed docs
install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
rmdir $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -59,23 +57,26 @@
rm -rf $RPM_BUILD_ROOT
%post
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q -o %{_datadir}/omf/%{name}; fi
+%scrollkeeper_update_post
%postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -q; fi
+%scrollkeeper_update_postun
%files -f %{name}.lang
%defattr(644,root,root,755)
+%doc ABOUT-NLS AUTHORS INSTALL NEWS README TODO
%attr(755,root,root) %{_bindir}/xiphos
+# XXX these two together do not make sense, add just dir or list verbosely contents?
%dir %{_datadir}/xiphos
%{_datadir}/xiphos/*
%dir %{_datadir}/omf/xiphos
%{_datadir}/omf/xiphos/*.omf
+# XXX: include ext to glob
%{_pixmapsdir}/*
+# XXX: create non-scaled pixmaps
%{_iconsdir}/hicolor/scalable/apps/xiphos.svg
-%doc %{_datadir}/gnome/help/*
-%doc ABOUT-NLS AUTHORS COPYING INSTALL NEWS README TODO
%{_desktopdir}/%{name}.desktop
+%doc %{_datadir}/gnome/help/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -83,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2010/05/22 19:47:37 glen
+- adapter, scrollkeeper deps from PLD-doc/BuildRequires.txt, plant todos
+
Revision 1.5 2010/05/21 20:13:06 caleb
- Reset to non-integer release, not done tinkering yet
@@ -97,4 +101,3 @@
Revision 1.1 2010/05/21 09:43:15 caleb
- Initial add adapted from upstream FC spec
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xiphos/xiphos.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list