diff --git a/libqalculate-htmldir.patch b/libqalculate-htmldir.patch new file mode 100644 index 0000000..855019c --- /dev/null +++ b/libqalculate-htmldir.patch @@ -0,0 +1,22 @@ +--- docs/reference/Makefile.in 2010-01-05 10:26:18.000000000 -0500 ++++ docs/reference/Makefile.in.new 2013-08-15 16:44:28.332220662 -0400 +@@ -222,7 +222,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-referencedir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/reference/html ++referencedir = $(docdir)/reference/html + reference_DATA = html/*.png html/*.html html/*.css + EXTRA_DIST = html/*.png html/*.html html/*.css + all: all-am +--- docs/reference/Makefile.am 2009-12-02 15:24:28.000000000 -0500 ++++ docs/reference/Makefile.am.new 2013-08-15 16:45:21.553221330 -0400 +@@ -2,7 +2,7 @@ + # docs/reference/Makefile.am for qalculate + # + +-referencedir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/reference/html ++referencedir = $(docdir)/reference/html + reference_DATA = html/*.png html/*.html html/*.css + + EXTRA_DIST = html/*.png html/*.html html/*.css diff --git a/libqalculate.spec b/libqalculate.spec index 7212743..bd4c265 100644 --- a/libqalculate.spec +++ b/libqalculate.spec @@ -7,7 +7,7 @@ Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: libqalculate-0.9.7-pkgconfig_private.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch2: libqalculate-htmldir.patch BuildRequires: glib2-devel, cln-devel BuildRequires: libxml2-devel BuildRequires: readline-devel, ncurses-devel @@ -43,6 +43,7 @@ frontends are provided by qalculate-gtk and qalculate-kde packages resp. %prep %setup -q %patch1 -p1 -b .pkgconfig_private +%patch2 -p0 -b .htmldir-unversioned %build %configure --disable-static @@ -56,9 +57,6 @@ make DESTDIR=%{buildroot} install %find_lang %{name} rm -f %{buildroot}/%{_libdir}/*.la -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -80,6 +78,9 @@ rm -rf %{buildroot} %{_bindir}/qalc %changelog +* Thu Aug 15 2013 Deji Akingunola - 0.9.7-8 +- Fix for versioned docdir build error + * Sat Aug 03 2013 Fedora Release Engineering - 0.9.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild