rpms/kio_sword/devel kio_sword-build_fixes.patch, NONE, 1.1 kio_sword.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

David Anderson (anderson) fedora-extras-commits at redhat.com
Sat Jan 13 17:03:21 UTC 2007 

Author: anderson

Update of /cvs/extras/rpms/kio_sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12873/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kio_sword-build_fixes.patch kio_sword.spec 
Log Message:
auto-import kio_sword-0.3-3 on branch devel from kio_sword-0.3-3.src.rpm

kio_sword-build_fixes.patch:

--- NEW FILE kio_sword-build_fixes.patch ---
--- configure	2006-12-16 11:11:58.000000000 -0500
+++ configure.new	2007-01-12 09:49:21.000000000 -0500
@@ -32379,7 +32379,7 @@
 echo "$as_me:$LINENO: checking for Sword library files" >&5
 echo $ECHO_N "checking for Sword library files... $ECHO_C" >&6
 
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
 
 if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
--- configure.in.in	2007-01-12 09:52:04.000000000 -0500
+++ configure.in.in.new	2007-01-12 09:52:27.000000000 -0500
@@ -4,6 +4,6 @@
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
-AC_CHECK_SWORD(1.5.7, [$ac_use_static])
+AC_CHECK_SWORD(1.5.8, [$ac_use_static])
 
 AC_CONFIG_FILES([ src/data/kio_sword.css ])
--- src/renderer.cpp	2006-12-16 11:11:32.000000000 -0500
+++ src/renderer.cpp	2007-01-12 09:24:57.000000000 -0500
@@ -150,7 +150,7 @@
 		else
 			setGlobalOption("Variants", "Primary Readings");
 			
-		LocaleMgr::systemLocaleMgr.setDefaultLocaleName(options.locale());
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale());
 	}
 	
 	/** Return an HTML hyperlinked list of all modules,
@@ -471,7 +471,7 @@
 			return;
 		
 		// FIXME - why do I need this call to setLocale()?
-		vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+		vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
 		
 		modtextdir = textDirection(module);
 			
@@ -835,7 +835,7 @@
 		
 		if (!vk)
 			return output;
-		vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
+		vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
 			
 		module->setSkipConsecutiveLinks(true);
 		vk->AutoNormalize(1);
@@ -1015,7 +1015,7 @@
 	
 	QStringList Renderer::availableLocales()
 	{
-		list<SWBuf> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();
+		list<SWBuf> locales = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
 		list<SWBuf>::const_iterator it;
 		list<SWBuf>::const_iterator it_end = locales.end();
 		QStringList output;


--- NEW FILE kio_sword.spec ---
Name: kio_sword
Version: 0.3
Release: 3%{?dist}
Summary: A lightweight frontend for the Sword Bible project for KDE
URL: http://lukeplant.me.uk/kio-sword/
License: GPL
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/kio-sword/kio_sword-%{version}.tar.gz
Patch0: kio_sword-build_fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel sword-devel >= 1.5.8

%description
A lightweight easy-to-use Bible tool for KDE.
Kio-Sword provides access to Bibles, commentaries
and other texts in an easy to use and attractive
interface -- the Konqueror web browser.  It does so
using the SWORD Bible project and implementing a KDE
ioslave, providing the sword:/ protocol.

To use, type 'sword:/' in a Konqueror window location
bar, and browse.  Help files can be found at
'sword:/?help'.

%prep
%setup -q
%patch0 -p0 -b .fixes

%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export KDEDIR=`kde-config --prefix`
%configure --disable-rpath
make %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

#Fix symlink to be relative
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kio_sword/common
pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kio_sword/
ln -s ../common common
popd

%find_lang kio_sword || touch kio_sword.lang
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT/$HTML_DIR ]; then
	for lang_dir in $RPM_BUILD_ROOT/$HTML_DIR/* ; do
		lang=$(basename $lang_dir)
		echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> kio_sword.lang
	done
fi

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files -f kio_sword.lang
%defattr(-,root,root,-)
%{_datadir}/apps/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/services/sword.protocol
%{_libdir}/kde3/%{name}.so
%{_libdir}/kde3/%{name}.la
%doc AUTHORS COPYING README TODO

%changelog
* Fri Jan 12 2007 David Anderson <fedora-packaging at dw-perspective.org.uk> 0.3-3
- Spec cleanups (thanks to Deji Akingunola)

* Tue Dec 19 2006 David Anderson <fedora-packaging at dw-perspective.org.uk> 0.3-1
- Update to 0.3
- Author moved download to sourceforge
- Fix some suggestions from bz#219873


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kio_sword/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2007 17:01:46 -0000	1.1
+++ .cvsignore	13 Jan 2007 17:02:51 -0000	1.2
@@ -0,0 +1 @@
+kio_sword-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kio_sword/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2007 17:01:46 -0000	1.1
+++ sources	13 Jan 2007 17:02:51 -0000	1.2
@@ -0,0 +1 @@
+957c563737d47900f67661086732ee12  kio_sword-0.3.tar.gz

More information about the scm-commits mailing list