[gnue-common] Work-around docdir issues (F20FTBFS RHBZ #992413, F21FTBFS RHBZ #1106692).

corsepiu corsepiu at fedoraproject.org
Wed Jul 16 12:37:43 UTC 2014


commit 012083a03a69893a2814f66463fb7467cafb2b82
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Jul 16 14:38:04 2014 +0200

    Work-around docdir issues (F20FTBFS RHBZ #992413, F21FTBFS RHBZ #1106692).
    
    - Modernize spec.

 gnue-common.spec |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/gnue-common.spec b/gnue-common.spec
index 8000774..a8e793e 100644
--- a/gnue-common.spec
+++ b/gnue-common.spec
@@ -30,14 +30,11 @@
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-## Avoid suspected find-debuginfo.sh bug in mock for Fedora 9?:
-%define debug_package %{nil}
-
 ### Code:
 
 Name: gnue-common
 Version: 0.6.9
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: GNU Enterprise Common Base
 
 Group: Applications/Productivity
@@ -48,7 +45,6 @@ Patch0: gnue-diag.sh.diff
 Patch1: gnue-common_INSTALL.diff
 Patch2: hints.postgresql.txt.diff
 Patch3: gnue-common_setup.py.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
 BuildRequires: python-devel
@@ -81,36 +77,35 @@ mv src/printing/pdftable/sample.py scripts/pdftable-example.py
 ## Quiet rpmlint warning "doc-file-dependency"
 rm -f scripts/pdftable-example.py
 
+# Replace hardcoded doc-subdir
+docsubdir=$(echo %{_pkgdocdir} | sed -e 's,^/usr/,,')
+sed -i -e "s,'share/doc/gnue-common-.*VERSION,'$docsubdir'", setup.py
+
 %build
 
 %install
-rm -rf %{buildroot}
 %{__python} ./setup.py install -O1 --prefix=%{_prefix} --root=%{buildroot}
 %find_lang %{name}
-cp -pr %{buildroot}%{_docdir}/%{name}-%{version} doc
-
-
-%clean
-rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/gnue-schema
 %{_mandir}/man1/gnue-schema.1.gz
 %{python_sitelib}/gnue
-%if 0%{?fedora} >= 9
-  %{python_sitelib}/gnue_common-%{version}*.egg-info
-%endif
+%{python_sitelib}/gnue_common-%{version}*.egg-info
 %{_datadir}/gnue
 %config %dir %{_sysconfdir}/gnue
 ## These files are only samples, and could be updated by upstream authors.
 %config /etc/gnue/sample.connections.conf
 %config /etc/gnue/sample.gnue.conf
 %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS 
-%doc doc/technotes scripts/gnue-diag.sh doc/%{name}-%{version}/*
+%doc doc/technotes scripts/gnue-diag.sh
 
 %changelog
+* Wed Jul 16 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.6.9-15
+- Work-around docdir issues (F20FTBFS RHBZ #992413, F21FTBFS RHBZ #1106692).
+- Modernize spec.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list