* rpm/*: revert Chris Lyttle's patches. Make gnucash.spec depend

on Postgres however it will build two RPMS: gnucash and
	gnucash-postgres.  The former does NOT depend on postgres and
	should be installable on systems without it

	* src/optional/Makefile.am: backport a change to allow 'make dist" to work
	* src/optional/swig/makefile.am: don't require swig for "make dist"


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/1.6@7190 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldreleases/1.6
Derek Atkins 24 years ago
parent a6aae44d5e
commit 0f40a963e8

@ -1,3 +1,13 @@
2002-08-23 Derek Atkins <derek@ihtfp.com>
* rpm/*: revert Chris Lyttle's patches. Make gnucash.spec depend
on Postgres however it will build two RPMS: gnucash and
gnucash-postgres. The former does NOT depend on postgres and
should be installable on systems without it
* src/optional/Makefile.am: backport a change to allow 'make dist" to work
* src/optional/swig/makefile.am: don't require swig for "make dist"
2002-08-21 Chris Lyttle <chris@wilddev.net>
* rpm/gnucash.spec.in: removed dependency on Postgres

@ -1,10 +1,9 @@
EXTRA_DIST = \
.cvsignore \
gnucash.spec.in \
gnucash-sql.spec.in
gnucash.spec.in
all-local: gnucash.spec gnucash-sql.spec
all-local: gnucash.spec
## We borrow guile's convention and use @-...-@ as the substitution
## brackets here, instead of the usual @...@. This prevents autoconf
@ -16,10 +15,4 @@ gnucash.spec: gnucash.spec.in Makefile
-e 's:@-VERSION-@:${VERSION}:'
mv $@.tmp $@
gnucash-sql.spec: gnucash-sql.spec.in Makefile
rm -f $@.tmp
sed < $@.in > $@.tmp \
-e 's:@-VERSION-@:${VERSION}:'
mv $@.tmp $@
CLEANFILES = gnucash.spec gnucash-sql.spec
CLEANFILES = gnucash.spec

@ -1,79 +0,0 @@
Name: gnucash
Summary: GnuCash is an application to keep track of your finances.
Version: @-VERSION-@
Release: 1
Copyright: Free Software Foundation
Group: Applications/Productivity
Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{PACKAGE_VERSION}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: gnome-libs >= 1.2.0, gdk-pixbuf >= 0.2.5, gnome-print >= 0.21
Requires: guile >= 1.3.4, gtkhtml >= 0.8, Guppi >= 0.35.3
Requires: g-wrap >= 1.1.11, umb-scheme >= 3.2, gal >= 0.8
BuildPrereq: g-wrap-devel >= 1.1.11, gtkhtml-devel >= 0.8,
BuildPrereq: Guppi-devel, postgresql-devel, gal-devel, libxml-devel
BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel
BuildPrereq: readline-devel
Prereq: /sbin/ldconfig /sbin/install-info
%description
GnuCash is a personal finance manager. A check-book like
register GUI allows you to enter and track bank accounts,
stocks, income and even currency trades. The interface is
designed to be simple and easy to use, but is backed with
double-entry accounting principles to ensure balanced books.
%prep
%setup -q
%build
autoconf
./configure --enable-sql --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \
--infodir=%{_infodir} --mandir=%{_mandir}
make || :
cd src/engine
make libgncengine.la
cd ../..
make
%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir} \
infodir=$RPM_BUILD_ROOT/%{_infodir} mandir=$RPM_BUILD_ROOT/%{_mandir} install
%find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/gnucash-design.info.gz %{_infodir}/dir
%postun
/sbin/ldconfig
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/gnucash-design.info.gz
%{_infodir}/dir
fi
%files -f %{name}.lang
%defattr(444,root,root,755)
%attr(555,root,root) %{_bindir}/*
%attr(555,root,root) %{_datadir}/gnucash/finance-quote-helper
%{_mandir}/man*/*
%{_infodir}/*.gz
%{_libdir}/*
%dir %{_datadir}/gnucash
%{_datadir}/gnucash/accounts
%{_datadir}/gnucash/doc
%{_datadir}/gnucash/guile-modules
%{_datadir}/gnucash/html
%{_datadir}/gnucash/scm
%{_datadir}/gnome/help/gnucash
%{_datadir}/gnome/apps/Applications/*
%{_datadir}/pixmaps/gnucash
%{_datadir}/mime-info/gnucash.*
%config %{_sysconfdir}/gnucash
%doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches
%doc doc/README.german doc/README.francais doc/guile-hackers.txt

@ -10,8 +10,9 @@ Requires: gnome-libs >= 1.2.0, gdk-pixbuf >= 0.2.5, gnome-print >= 0.21
Requires: guile >= 1.3.4, gtkhtml >= 0.8, Guppi >= 0.35.3
Requires: g-wrap >= 1.1.11, umb-scheme >= 3.2, gal >= 0.8
BuildPrereq: g-wrap-devel >= 1.1.11, gtkhtml-devel >= 0.8,
BuildPrereq: Guppi-devel, gal-devel, libxml-devel, readline-devel,
BuildPrereq: Guppi-devel, postgresql-devel, gal-devel, libxml-devel
BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel
BuildPrereq: readline-devel
Prereq: /sbin/ldconfig /sbin/install-info
%description
@ -22,18 +23,25 @@ designed to be simple and easy to use, but is backed with
double-entry accounting principles to ensure balanced books.
%package postgres
Requires: gnucash = %{PACKAGE_VERSION}
Summary: SQL (PostgreSQL) backend package for GnuCash
%description postgres
GnuCash is a personal finance manager. A check-book like
register GUI allows you to enter and track bank accounts,
stocks, income and even currency trades. The interface is
designed to be simple and easy to use, but is backed with
double-entry accounting principles to ensure balanced books.
This package contains the SQL Backend for PostgreSQL databases.
%prep
%setup -q
%build
autoconf
./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \
./configure --enable-sql --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \
--infodir=%{_infodir} --mandir=%{_mandir}
make || :
cd src/engine
make libgncengine.la
cd ../..
make
%install
@ -42,8 +50,12 @@ make prefix=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir}
infodir=$RPM_BUILD_ROOT/%{_infodir} mandir=$RPM_BUILD_ROOT/%{_mandir} install
%find_lang %name
# Create the list of libdir files to include (which is everything but postgres
(cd $RPM_BUILD_ROOT && find %{_libdir} \! -name libgnc_postgres\* -print`) > gc-libdir-file-list
%clean
rm -rf $RPM_BUILD_ROOT
rm -f gc-libdir-file-list
%post
/sbin/ldconfig
@ -56,13 +68,12 @@ if [ $1 = 0 ]; then
%{_infodir}/dir
fi
%files -f %{name}.lang
%files -f %{name}.lang -f gc-libdir-file-list
%defattr(444,root,root,755)
%attr(555,root,root) %{_bindir}/*
%attr(555,root,root) %{_datadir}/gnucash/finance-quote-helper
%{_mandir}/man*/*
%{_infodir}/*.gz
%{_libdir}/*
%dir %{_datadir}/gnucash
%{_datadir}/gnucash/accounts
%{_datadir}/gnucash/doc
@ -76,3 +87,7 @@ fi
%config %{_sysconfdir}/gnucash
%doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches
%doc doc/README.german doc/README.francais doc/guile-hackers.txt
%files postgres
%defattr(444,root,root,755)
%{_libdir}/libgnc_postgres*

@ -1,7 +1,7 @@
# Engine Makefile.am file.
# don't build sql or RPC subdirs by default, unless you want hurt
SUBDIRS = ${SQL_DIR} ${RPC_DIR}
SUBDIRS = . ${SQL_DIR} ${RPC_DIR}
# but put them in the dist
DIST_SUBDIRS = sql rpc

@ -4,6 +4,10 @@ EXTRA_DIST = \
# N.B. Do *not* specify subdirs, since we do *not* want the swig subdirs
# built by default, since many folks may not have swig installed, and this
# is, after all, optional. But do put them in the dist.
# is, after all, optional. We need SUBDIRS in order for make dist to work.
SUBDIRS = .
# But do put them in the dist.
DIST_SUBDIRS = swig

@ -28,6 +28,11 @@ EXTRA_DIST = \
perl5_typemaps.i \
gnucash-swig-defines.c
#
# We include this here so we do not try to distribute gnucash-engine-perl5_wrap.c
#
DISTFILES = $(DIST_COMMON) helperfuncs.c $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
AM_CFLAGS = \
-I@PERLINCL@/CORE \
${GNOME_INCLUDEDIR} \
@ -103,9 +108,3 @@ gnucash-engine-perl5_wrap.c: gnucash-swig-defines.c \
CLEANFILES += gnucash-engine-perl5_wrap.c
CLEANFILES += gnucash.pm gnucash.so
# We have to do this because otherwise automake insists on putting
# these files into the dist tarfile. If there's a a better way,
# by all means, let us know...
dist-hook:
rm -f ${distdir}/gnucash-engine-perl5_wrap.c

Loading…
Cancel
Save