Accepting request 130012 from GNOME:Apps
Only require guile1 on 12.2, not libguile1-devel... (forwarded request 130011 from dimstar) OBS-URL: https://build.opensuse.org/request/show/130012 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=45
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
0359c254bd
commit
73ee563866
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:52e65623b5ad812b8eeb4c221951e9b0ba3c49e28916acfb7b92566da159e6cc
|
||||
size 9367104
|
||||
3
gnucash-2.4.11.tar.bz2
Normal file
3
gnucash-2.4.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:93c3d66af8d75da66dad814cabeb35aac417018ccc98e833af93b2ab4d7b7761
|
||||
size 9408193
|
||||
@ -1,21 +0,0 @@
|
||||
Index: gnucash-2.4.9/src/optional/python-bindings/Makefile.am
|
||||
===================================================================
|
||||
--- gnucash-2.4.9.orig/src/optional/python-bindings/Makefile.am
|
||||
+++ gnucash-2.4.9/src/optional/python-bindings/Makefile.am
|
||||
@@ -2,7 +2,7 @@ SUBDIRS = . tests
|
||||
|
||||
SWIG_FILES = gnucash_core.i timespec.i
|
||||
|
||||
-pkgpython_PYTHON = \
|
||||
+pkgpyexec_DATA = \
|
||||
__init__.py \
|
||||
function_class.py \
|
||||
gnucash_core.py \
|
||||
@@ -85,6 +85,7 @@ gnucash_core_c.py: gnucash_core.c $(SWIG
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
+ $(pkgpyexec_DATA) \
|
||||
$(SWIG_FILES) \
|
||||
example_scripts/simple_book.py \
|
||||
example_scripts/simple_session.py \
|
||||
@ -1,14 +0,0 @@
|
||||
Index: doc/Makefile.am
|
||||
===================================================================
|
||||
--- doc/Makefile.am (revision 22245)
|
||||
+++ doc/Makefile.am (revision 22246)
|
||||
@@ -49,7 +49,7 @@
|
||||
tip_of_the_day.list: tip_of_the_day.list.in Makefile
|
||||
${CC} -E -P -x c -D'N_(x)=x' -o $@.tmp $<
|
||||
cat -s $@.tmp | ${SED} -e 's/^ *"//' \
|
||||
- -e 's/" *$$//' \
|
||||
+ -e 's/" *$$/\n/' \
|
||||
-e 's/"* *[|] */|/' \
|
||||
-e 's:@-GNUCASH_LATEST_STABLE_SERIES-@:${GNUCASH_LATEST_STABLE_SERIES}:g' > $@
|
||||
rm -f $@.tmp
|
||||
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 5 16:13:50 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- For openSUSE 12.2, guile1 is sufficient (bnc#772490).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 3 19:45:15 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.4.11:
|
||||
+ Rewrite the tip-of-the-day parsing logic
|
||||
+ Scheduled monthly transactions lose "except on weekends"
|
||||
setting when using MySQL (bgo#671323)
|
||||
+ String fixes
|
||||
+ Bugs fixed: bgo#611853, bgo#631611, bgo#632931, bgo#668196,
|
||||
bgo#669494, bgo#670727, bgo#674283, bgo#674494, bgo#674862,
|
||||
bgo#677570, bgo#677570, bgo#678214, bgo#678848.
|
||||
- Drop gnucash-fix-python-install.patch: upstream fixed.
|
||||
- Drop gnucash-tip-of-the-day.patch: upstream fixed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 21 10:24:05 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
|
||||
25
gnucash.spec
25
gnucash.spec
@ -17,20 +17,16 @@
|
||||
|
||||
|
||||
Name: gnucash
|
||||
Version: 2.4.10
|
||||
Version: 2.4.11
|
||||
Release: 0
|
||||
Summary: Personal Finance Manager
|
||||
License: SUSE-GPL-2.0-with-openssl-exception or SUSE-GPL-3.0-with-openssl-exception
|
||||
Group: Productivity/Office/Finance
|
||||
Url: http://www.gnucash.org/
|
||||
Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.4.10/%{name}-%{version}.tar.bz2
|
||||
Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.4.11/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM gnucash-fix-python-install.patch bgo#668196 vuntz@opensuse.org -- Fix installation of python bindings
|
||||
Patch0: gnucash-fix-python-install.patch
|
||||
# PATCH-FIX-UPSTREAM gnucash-tip-of-the-day.patch bnc#771603 dimstar@opensuse.org -- Fix tip-of-the-day with gcc-4.7, svn commit r22246
|
||||
Patch1: gnucash-tip-of-the-day.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
|
||||
Patch3: gnucash-cpan-warning.patch
|
||||
Patch0: gnucash-cpan-warning.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
@ -62,14 +58,21 @@ BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(webkit-1.0)
|
||||
#BuildRequires: callgrind
|
||||
# tested but unused BuildRequires: readline-devel qt3-devel termcap
|
||||
%if %{?suse_version} >= 1210
|
||||
# FIXME: guile1 should be enough, but:
|
||||
|
||||
# In openSUSE 12.2, guile1 packaging was fixed to have the .so files in the main package
|
||||
%if 0%{?suse_version} > 1210
|
||||
Requires: guile1
|
||||
%else
|
||||
%if 0%{?suse_version} == 1210
|
||||
# on 12.1, guile1 was 'broken' and we require libguile1-devel
|
||||
# ERROR: In procedure dynamic-link:
|
||||
# ERROR: file: "libguile-srfi-srfi-1-v-3", message: "file not found"
|
||||
Requires: libguile1-devel
|
||||
%else
|
||||
# Before openSUSE 12.1, guile 2 was not existing, so guile == guile1
|
||||
Requires: guile
|
||||
%endif
|
||||
%endif
|
||||
# Required to make quotes working. Gnucash can run without quotes support:
|
||||
Requires: perl-Crypt-SSLeay
|
||||
Requires: perl-Date-Manip
|
||||
@ -130,10 +133,8 @@ balanced books.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
# This patch must be applied:
|
||||
%patch3
|
||||
%patch0
|
||||
|
||||
%build
|
||||
%if %{?suse_version} >= 1210
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user