[gnusim8085] Use %{_pkgdocdir} instead of hard-coded doc path (FTBFS RHBZ #1106694).
corsepiu
corsepiu at fedoraproject.org
Fri Jul 4 06:33:44 UTC 2014
commit cbc61a127ea245d2af0a00ee08ce30414b3f2de5
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Fri Jul 4 08:33:48 2014 +0200
Use %{_pkgdocdir} instead of hard-coded doc path (FTBFS RHBZ #1106694).
- Append --disable-silent-rules to %configure.
- Fix broken %changelog entry.
gnusim8085.spec | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/gnusim8085.spec b/gnusim8085.spec
index 3dcf909..a7412a8 100644
--- a/gnusim8085.spec
+++ b/gnusim8085.spec
@@ -1,6 +1,6 @@
Name: gnusim8085
Version: 1.3.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Graphical simulator for 8085 assembly language
Group: Applications/Engineering
@@ -8,6 +8,8 @@ License: GPLv2+
URL: http://gnusim8085.org/
Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
BuildRequires: gtksourceview2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
@@ -27,16 +29,14 @@ can be used for debugging the programs.
%setup -q
%build
-%configure --docdir %{_pkgdocdir}
-V=1 make %{?_smp_mflags} CFLAGS="%{optflags}"
+%configure --docdir %{_pkgdocdir} --disable-silent-rules
+make %{?_smp_mflags} CFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/pixmaps/%{name}
make INSTALL="install -p" DESTDIR=%{buildroot} install
-cp -p COPYING %{buildroot}%{_datadir}/doc/%{name}-%{version}
-
-chmod 644 %{buildroot}%{_datadir}/doc/%{name}-%{version}/COPYING
+install -p -m 0644 COPYING %{buildroot}%{_pkgdocdir}
desktop-file-install --vendor "" \
--add-category "Electronics" \
@@ -65,7 +65,7 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_datadir}/doc/%{name}-%{version}/
+%{_pkgdocdir}
%{_mandir}/man1/%{name}.1*
%{_bindir}/gnusim8085
%{_datadir}/applications/GNUSim8085.desktop
@@ -74,11 +74,16 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/scalable/apps/gnusim8085.svg
%changelog
+* Fri Jul 04 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.3.7-8
+- Use %%{_pkgdocdir} instead of hard-coded doc path (FTBFS RHBZ #1106694).
+- Append --disable-silent-rules to %%configure.
+- Fix broken %%changelog entry.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Sep 02 2013 Patrick Uiterwijk <patrick at puiterwijk.org> - 1.3.7-6
-- Move doc to %{_pkgdocdir} for UnversionedDocdirs
+- Move doc to %%{_pkgdocdir} for UnversionedDocdirs
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list