[libsilc] Reflect docdir changes (Address FTBFS, RHBZ #992125).

corsepiu corsepiu at fedoraproject.org
Mon Aug 12 04:53:21 UTC 2013


commit 700d6badc1c7cace19b8375b3c28a595458b8654
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Aug 12 06:53:05 2013 +0200

    Reflect docdir changes (Address FTBFS, RHBZ #992125).

 libsilc.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/libsilc.spec b/libsilc.spec
index ad32d94..f535618 100644
--- a/libsilc.spec
+++ b/libsilc.spec
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.10
-Release: 9%{dist}
+Release: 10%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 %description
 SILC Client Library libraries for clients to connect to SILC networks.
 
@@ -58,7 +60,7 @@ chmod +x %{__find_provides}
 autoreconf -f -i
 %configure --libdir=%{_libdir} --enable-shared --without-libtoolfix \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
-           --docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
+           --docdir="%{_pkgdocdir}" CFLAGS="$RPM_OPT_FLAGS"
 
 # WARNING! smp flags cause bad binaries!
 make
@@ -73,7 +75,7 @@ chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib* ${RPM_BUILD_ROOT}%{_libdir}/silc/mod
 
 # move doc files that would be deleted by rpm
 mkdir docinst
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{toolkit,tutorial} docinst/
+mv $RPM_BUILD_ROOT%{_pkgdocdir}/{toolkit,tutorial} docinst/
 # fix encoding of zlib.html
 mv docinst/toolkit/zlib.html docinst/toolkit/zlib.html.orig
 iconv -f iso-8859-15 -t utf8 -o docinst/toolkit/zlib.html docinst/toolkit/zlib.html.orig
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 12 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.1.10-10
+- Reflect docdir changes (Address FTBFS, RHBZ #992125).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list