[sword-cvs] sword sword.spec.in,NONE,1.1 Makefile.am,1.44,1.45 configure.ac,1.38,1.39 sword.spec,1.2,NONE

[sword@www.crosswire.org]

Update of /cvs/core/sword
In directory www:/tmp/cvs-serv8839

Modified Files:
	Makefile.am configure.ac 
Added Files:
	sword.spec.in 
Removed Files:
	sword.spec 
Log Message:
mgruner: applied Michael A Peter's spec file patches. Hope all is ok.


--- NEW FILE: sword.spec.in ---
Summary:	The SWORD Project framework for manipulating Bible texts
Name:		sword
%define version @VERSION@
Version:	%{version}
Release:	1
#Icon:		sword.gif
Copyright:	GPL
Packager:	CrossWire Bible Society
URL:		http://www.crosswire.org/sword
Source:		http://www.crosswire.org/download/ftpmirror.tmp/pub/sword/source/v1.5/sword-%{version}.tar.gz
Group:		System Environment/Libraries
BuildRoot:	%{_tmppath}/sword-root
Requires:	curl
Requires:	zlib
# Requires:	icu >= 2.6
# Patch0:		sword-patch-curl.diff

%description
The SWORD Project is an effort to create an ever expanding software package for research and study of God and His Word.
The SWORD Bible Framework allows easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.  Many frontends are build using this framework.
An installed module set may be shared between any frontend using the framework.

%package devel
Summary: Include files and static libraries for developing sword applications.
Group: Development/Libraries
Requires:	sword = %{version}
Requires:	curl-devel >= 7.10.5
Requires:	zlib-devel

%description devel
Include files and static libraries for developing sword applications. This package is required to compile Sword frontends, too.

%prep
%setup -q
# %patch0 -p1

%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS='-s'
 ./usrinst.sh --disable-dependency-tracking --prefix=/usr --sysconfdir=/etc --enable-utilities --with-curl --disable-debug --enable-shared --with-conf
make

%install
rm -rf $RPM_BUILD_ROOT
make install-strip DESTDIR="$RPM_BUILD_ROOT"
make install_config DESTDIR="$RPM_BUILD_ROOT"
mkdir -p $RPM_BUILD_ROOT/usr/lib/sword
exit 0

%post devel -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig

%files
%defattr(-,root,root)
%config /etc/sword.conf
%config /usr/share/sword/mods.d/globals.conf
%config /usr/share/sword/locales.d/*.conf
%doc README AUTHORS NEWS INSTALL
/usr/lib/libsword*.so*
#Available when ICU is used in Sword
# /usr/lib/sword

%files devel
%defattr(-,root,root)
%doc doc/*
/usr/include/sword
/usr/lib/libsword*.*a
/usr/bin/*

%changelog
* Mon Dec 27 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
- Version 1.5.7
- Added a patch to make installmgr work on Curl version 7.10.5
- We require libcurl now
* Mon May 20 2002 Joachim Ansorg <junkmail@joachim.ansorgs.de>
- Version 1.5.6
* Mon May 20 2002 Stuart Gathman <stuart@bmsi.com>
- Version 1.5.3
* Wed Dec 19 2001 Stuart Gathman <stuart@bmsi.com>
- add additional utilities, move to /usr/lib/sword
* Thu Dec 13 2001 Stuart Gathman <stuart@bmsi.com>
- add locales config
* Sat Jan 20 2001 Stuart Gathman <stuart@bmsi.com>
- mkfastmod and other utilities
* Thu Nov 30 2000 Stuart Gathman <stuart@bmsi.com>
- cheatah application
* Fri Nov 17 2000 Stuart Gathman <stuart@bmsi.com>
- initial release

Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile.am	12 Apr 2004 13:47:21 -0000	1.44
+++ Makefile.am	21 Apr 2004 07:06:39 -0000	1.45
@@ -149,8 +149,8 @@
 	@echo ""
 
 install_config: 
-	@echo "[Install]" > $(sysconfdir)/sword.conf
-	@echo "DataPath=$(pkgdatadir)/" >> $(sysconfdir)/sword.conf
+	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
 	@echo "sword.conf generated"
 
 dist-hook:

Index: configure.ac
===================================================================
RCS file: /cvs/core/sword/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.ac	12 Apr 2004 13:47:21 -0000	1.38
+++ configure.ac	21 Apr 2004 07:06:40 -0000	1.39
@@ -319,6 +319,6 @@
 AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/refsys/Makefile \
 	utilities/Makefile examples/Makefile \
 	examples/cmdline/Makefile \
-	utilities/diatheke/Makefile icu/Makefile sword.pc)
+	utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec)
 AC_OUTPUT
 

--- sword.spec DELETED ---