diff --git a/.gitignore b/.gitignore index 369109333e..3f6af652c9 100644 --- a/.gitignore +++ b/.gitignore @@ -63,9 +63,6 @@ macros/lt~obsolete.m4 make-gnucash-potfiles missing mkinstalldirs -packaging/gnucash.spec -packaging/win32/custom.sh -packaging/win32/gnucash.iss po/.intltool-merge-cache po/Makefile.in.in po/POTFILES diff --git a/CMakeLists.txt b/CMakeLists.txt index 239e41be2d..a5cd9854a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -684,7 +684,6 @@ ADD_SUBDIRECTORY (data) ADD_SUBDIRECTORY (doc) ADD_SUBDIRECTORY (lib) ADD_SUBDIRECTORY (macros) -ADD_SUBDIRECTORY (packaging) ADD_SUBDIRECTORY (po) ADD_SUBDIRECTORY (common) ADD_SUBDIRECTORY (libgnucash) diff --git a/Makefile.am b/Makefile.am index 95d76eb91a..99b6cb17f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ if GNUCASH_ENABLE_GUI else GNUCASH_SUBDIR = endif -SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} packaging po data +SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} po data GNC_CTAGS_FILE = @GNC_CTAGS_FILE@ GNC_ETAGS_FILE = @GNC_ETAGS_FILE@ diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake index 1c6dc9bdea..facf319849 100644 --- a/common/cmake_modules/MakeDistFiles.cmake +++ b/common/cmake_modules/MakeDistFiles.cmake @@ -100,7 +100,6 @@ SET(COPY_FROM_BUILD SET(COPY_FROM_BUILD_2 doc/gnucash.1 # Uses GNC_CONFIGURE - packaging/gnucash.spec # Uses GNC_CONFIGURE po/gnucash.pot libgnucash/doc/design/stamp-vti libgnucash/doc/design/version.texi diff --git a/configure.ac b/configure.ac index 34417cb764..483bcb668e 100644 --- a/configure.ac +++ b/configure.ac @@ -1750,7 +1750,6 @@ AC_CONFIG_FILES( libgnucash/tax/Makefile libgnucash/tax/us/Makefile libgnucash/tax/us/test/Makefile - packaging/Makefile dnl # non-makefiles gnucash/bin/gnucash.rc libgnucash/app-utils/migratable-prefs.xml diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt deleted file mode 100644 index 041e062c88..0000000000 --- a/packaging/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -GNC_CONFIGURE(gnucash.spec.in gnucash.spec) - -SET_DIST_LIST(packaging_DIST CMakeLists.txt gnucash.spec.in Makefile.am) \ No newline at end of file diff --git a/packaging/Makefile.am b/packaging/Makefile.am deleted file mode 100644 index 17a41adee8..0000000000 --- a/packaging/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -EXTRA_DIST = \ - gnucash.spec.in \ - gnucash.spec \ - CMakeLists.txt - -all-local: gnucash.spec - -## We borrow guile's convention and use @-...-@ as the substitution -## brackets here, instead of the usual @...@. This prevents autoconf -## from substituting the values directly into the left-hand sides of -## the sed substitutions. *sigh* -gnucash.spec: gnucash.spec.in Makefile ${top_builddir}/config.status - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:@-VERSION-@:${VERSION}:' - mv $@.tmp $@ - -DISTCLEANFILES = gnucash.spec diff --git a/packaging/README.RPM b/packaging/README.RPM deleted file mode 100644 index 6fd9eec509..0000000000 --- a/packaging/README.RPM +++ /dev/null @@ -1,88 +0,0 @@ -This directory contains spec files for building an RPM - - REALLY WATCH OUT: The files in this directory are historical - examples. They may be out of date and not maintained. Please - contact your local distro supplier for updates. - - WATCH OUT: These spec file(s) might be heavily out of date and/or - absolutely NOT SUITED to your distribution! They are particularly - matched for the Fedora Core 4 distribution, but DO NOT USE THEM if - you don't have exactly that distribution! Your own distribution - probably has its own source RPM of gnucash, and this source RPM - includes a spec file that is much better suited to your - distribution. - - I repeat: DO NOT USE THIS SPEC file unless you either have Fedora - Core 4 or you really know how you can modify it to suit your - distribution. - - For German-speaking users, there are German build instructions for - RPMs on http://linuxwiki.de/GnuCash/RpmInstallieren . - ------------------------------- -Original file content: - - -Short instructions: - -> I've never built an rpm; given a spec file, how do I do this? -> I understand the theory, just not clear on what to type up. - -You'll need to be root in many distributions. (It is possible to -avoid this requirement, but I haven't done the work to the RPM.) -However, in some distributions (e.g. SuSE) these instructions will -work even as a normal user. - -cd /usr/src/redhat/SOURCES -tar -zxvf xacc-1.x.tar.gz -cp xacc-1.x/rpm/xacc.spec ../SPECS -cp xacc-1.x/rpm/xacc.wmconfig . - -cd /usr/src/redhat/SPECS -rpm -ba xacc.spec - -wait a bit, and a new binary rpm will be in -/usr/src/redhat/RPMS/ and a new src.rpm will be in -/usr/src/redhat/SRPMS. - - -================================ - -JPL version: - -1) Obtain a GnuCash distribution (source code .tar.gz file), - either by downloading from an ftp site somewhere, or building - from CVS using "make dist". The file should have the nomenclature - gnucash-X.Y.Z.tar.gz where X.Y.Z are the release numbers. - -2) Copy and uncompress/tar the distribution in your - /usr/src/redhat/SOURCES directory. You will need to do this as the - root user. Note, use your distribution-specific path here, only - redhat uses "/usr/src/redhat". - - cd /usr/src/redhat/SOURCES - cp /SOMEPATH/gnucash-X.Y.Z.tar.gz - tar xvzf gnucash-X.Y.Z.tar.gz - -3) Copy the rpm spec file to /usr/src/redhat/SPEC. - - cp gnucash-X.Y.Z/rpm/gnucash.spec /usr/src/redhat/SPECS/. - -4) Edit the spec file, you probably will only need to modify the - following 3 lines, depending on what features you want to include - in the rpm: - - %define _with_postgres 0 (use postgres backend?) - %define _with_ofx 0 (use openofx package?) - %define _with_hbci 0 (use hbci package?) - -5) Build the binary and source RPMs - cd /usr/src/redhat/SPECS - rpmbuild -ba gnucash.spec - - (note: older versions of rpm use "rpm -ba FILE.spec" to build) - -6) Wait a bit, and a new binary rpm will be in - /usr/src/redhat/RPMS/ and a new src.rpm will be in - /usr/src/redhat/SRPMS. - diff --git a/packaging/gnucash.spec.in b/packaging/gnucash.spec.in deleted file mode 100644 index a077f4a9dc..0000000000 --- a/packaging/gnucash.spec.in +++ /dev/null @@ -1,264 +0,0 @@ -# -# Spec file for Fedora and other RedHat distros and derivatives -# -# Check whether GnuCash should build optional modules. -# To modify parameters, edit the .spec file, 0 is off, 1 is on -%define _with_postgres 0 -%define _with_ofx 1 -%define _with_hbci 1 -%define _with_dbi 1 - -# The --whatprovides redhat-release lets us work on RHEL as well as FC -# Granted, it will look weird, but at least it wont fail outright. -%define fc_rel %(rpm -q --queryformat='%{VERSION}' --whatprovides redhat-release) - -# Edit dist if not a Fedora release -%define dist FC%{fc_rel} - -%define version @-VERSION-@ -%define __libtoolize /bin/true - -%define libgnomeui_version 2.8.0 -%define libgnomeprintui_version 2.8.0 -%define guile_version 1.6.0 -%define gtkhtml3_version 3.1 -%define libofx_version 0.8.0 -%define aqbanking_version 1.3 -%define postgresql_version 7.1.3 - -Name: gnucash -Summary: GnuCash is an application to keep track of your finances. -Version: %{version} -Release: 1.%{dist} -License: GPL -Group: Applications/Finance -URL: http://www.gnucash.org -Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -Prereq: GConf2 -Prereq: /usr/bin/gconftool-2 -Prereq: /sbin/ldconfig -PreReq: /sbin/install-info - -Requires: libgnomeui >= %{libgnomeui_version} -Requires: libgnomeprintui22 >= %{libgnomeprintui22_version} -Requires: guile >= %{guile_version} -Requires: gtkhtml3 >= %{gtkhtml3_version} -Requires: slib >= 3a1 - -BuildRequires: gcc, intltool -BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui22_version} -BuildRequires: gtkhtml3-devel >= %{gtkhtml3_version} -BuildRequires: bzip2-devel, expat-devel, guile-devel -BuildRequires: libglade2-devel, libgsf-devel -BuildRequires: libjpeg-devel, openssl-devel -BuildRequires: goffice-devel - -%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. - - -%package devel -Summary: Header files for GnuCash development. -Group: Development/Libraries -Requires: gnucash = %{version} - -%description devel -This package contains header files for GnuCash development. -Install this package if you want to use GnuCash libraries -in C programs. - - -%if %{_with_ofx} -%package ofx -Summary: Enables OFX importing in GnuCash -Group: Applications/Finance -Requires: gnucash = %{version} -Requires: libofx >= %{libofx_version} -BuildRequires: libofx-devel - -%description ofx -This package adds OFX file import support to the base -GnuCash package. Install this package if you want to -import OFX files. -%endif - -%if %{_with_hbci} -%package hbci -Summary: Enables HBCI importing in GnuCash -Group: Applications/Finance -Requires: gnucash = %{version} -Requires: aqbanking >= %{aqbanking_version} -BuildRequires: aqbanking-devel - -%description hbci -This package adds HBCI file import support to the base -GnuCash package. Install this package if you want to -import HBCI files. -%endif - -%if %{_with_postgres} -%package backend-postgres -Summary: Backend for storing GnuCash data in a PostgreSQL database. -Group: Applications/Finance -Requires: gnucash = %{version} -Requires: postgresql >= %{postgresql_version} -BuildRequires: postgresql-devel - -%description backend-postgres - -This package contains a backend for storing your GnuCash accounts and -transactions in a PostgreSQL database. Install this package if you -want to keep your financial data in a database instead of a flat file -(recommended for large volumes of data and commercial sites). -%endif - -%if %{_with_dbi} -%package backend-dbi -Summary: DBI Backend for storing GnuCash data databases. -Group: Applications/Finance -Requires: gnucash = %{version} -Requires: libdbi -BuildRequires: libdbi-devel - -%description backend-dbi -This package contains a backend for storing GnuCash accounts in databases -using the libdbi package. To enable this functionality, you must install -one or more of the libdbi-dbd-* driver packages (e.g. libdbi-dbd-mysql, -libdbi-dbd-sqlite or libdbi-dbd-pgsql). -%endif - -%prep -%setup -q - -%build -%configure \ -%if %{_with_ofx} - --enable-ofx \ -%endif -%if %{_with_hbci} - --enable-aqbanking \ -%endif -%if %{_with_postgres} - --enable-sql \ -%endif -%if %{_with_dbi} - --enable-dbi \ -%endif - --enable-gui - - -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" - -%if %{_with_postgres} -cp -p src/backend/postgres/README README.postgres -%endif - -%install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$RPM_BUILD_ROOT%{_libdir}/gnucash make DESTDIR=$RPM_BUILD_ROOT install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - -%find_lang %name - -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig -/sbin/install-info %{_infodir}/gnucash-design.info.gz %{_infodir}/dir - -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS=%{_sysconfdir}/gconf/schemas/apps_gnucash*.schemas -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule $S > /dev/null -done - -%preun -if [ "$1" -eq 0 ]; then - #deleting the schema on package removal - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - SCHEMAS=%{_sysconfdir}/gconf/schemas/apps_gnucash*.schemas - for S in $SCHEMAS; do - gconftool-2 --makefile-uninstall-rule $S > /dev/null - done -fi - -%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) %{_libexecdir}/gnucash -%{_mandir}/man*/* -%{_infodir}/gnucash*info* -%{_libdir}/* -%{_datadir}/gnucash -%{_datadir}/applications/* -%{_datadir}/xml/gnucash/xsl/* -%{_datadir}/icons/* -%{_sysconfdir}/gconf/schemas/apps_gnucash* -%if %{_with_ofx} -%exclude %{_libdir}/gnucash/libgncmod-ofx* -%endif -%if %{_with_hbci} -%exclude %{_libdir}/gnucash/libgncmod-aqbanking* -%exclude %{_datadir}/gnucash/glade/aqbanking* -%exclude %{_sysconfdir}/gconf/schemas/apps_gnucash_dialog_hbci.schemas -%endif -%if %{_with_postgres} -%exclude %{_libdir}/libgnc-backend-postgres* -%endif -%if %{_with_dbi} -%exclude %{_libdir}/gnucash/libgncmod-backend-dbi* -%endif -%config %{_sysconfdir}/gnucash -%doc AUTHORS COPYING ChangeLog* DOCUMENTERS HACKING LICENSE NEWS README -%doc doc/README.german doc/README.francais doc/guile-hackers.txt - -%files devel -%defattr(444,root,root,755) -%{_includedir}/gnucash - -%if %{_with_ofx} -%files ofx -%defattr(444,root,root,755) -%{_libdir}/gnucash/libgncmod-ofx* -%doc doc/README.OFX -%endif - -%if %{_with_hbci} -%files hbci -%defattr(444,root,root,755) -%{_libdir}/gnucash/libgncmod-aqbanking* -%{_datadir}/gnucash/glade/aqbanking* -%{_sysconfdir}/gconf/schemas/apps_gnucash_dialog_hbci.schemas -%doc doc/README.HBCI -%endif - -%if %{_with_postgres} -%files backend-postgres -%defattr(444,root,root,755) -%{_libdir}/libgnc-backend-postgres* -%doc README.postgres -%endif - -%if %{_with_dbi} -%files backend-dbi -%defattr(444,root,root,755) -%{_libdir}/gnucash/libgncmod-backend-dbi* -%endif