Accepting request 294839 from GNOME:Apps

1

OBS-URL: https://build.opensuse.org/request/show/294839
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=59

gnucash.spec

@@ -17,13 +17,13 @@
 
 
 Name:           gnucash
-Version:        2.6.5
+Version:        2.6.6
 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.6.5/%{name}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         gnucash-cpan-warning.patch
@@ -33,14 +33,10 @@ BuildRequires:  automake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  guile-devel
 BuildRequires:  intltool
 BuildRequires:  libdbi-devel
 BuildRequires:  libdbi-drivers-dbd-sqlite3
-%if 0%{?suse_version} >= 1210
-BuildRequires:  libguile1-devel
-%else
-BuildRequires:  guile-devel
-%endif
 BuildRequires:  libofx-devel
 BuildRequires:  libtool
 BuildRequires:  python-devel >= 2.4
@@ -62,21 +58,7 @@ BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(webkit-1.0)
 #BuildRequires: callgrind
 # tested but unused BuildRequires: readline-devel qt3-devel termcap
-
-# 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
@@ -117,11 +99,7 @@ Summary:        Personal Finance Manager
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       gtk2-devel
-%if %{?suse_version} >= 1210
-Requires:       libguile1-devel
-%else
 Requires:       guile-devel
-%endif
 Requires:       libglade2-devel
 Requires:       libgnomeui-devel
 
@@ -148,6 +126,7 @@ balanced books.
 autoreconf -fiv
 %configure\
 	--libexecdir=%{_libexecdir}\
+        --docdir=%{_docdir}/%{name} \
 	--enable-ofx\
 	--enable-aqbanking\
 	--enable-locale-specific-tax\
@@ -195,7 +174,6 @@ rm -rf %{buildroot}
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/gnucash.appdata.xml
 %{_datadir}/applications/*.desktop
-%{_datadir}/doc/gnucash/
 %{_datadir}/glib-2.0/schemas/org.gnucash.*.xml
 %{_datadir}/gnucash/
 %{_datadir}/icons/hicolor/*/apps/gnucash-icon.png