[packages/highlight] noarch apidoc

glen glen at pld-linux.org
Sun Jan 10 23:35:00 CET 2016


commit 6dca621b6466270994dc8b0965fe8a10b0e3933d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 11 00:34:57 2016 +0200

    noarch apidoc

 highlight.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index 034cc28..9de4054 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,22 +1,22 @@
 #
 # Conditional build:
 %bcond_without	apidocs # don't generate apidocs subpackage
-#
+
 Summary:	A source code converter to HTML, XHTML, RTF, TeX, LaTeX, XSL-FO, and XML
 Summary(pl.UTF-8):	Konwerter kodu źródłowego do formatów HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Name:		highlight
 Version:	2.16
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		Applications/Publishing
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 # Source0-md5:	08f1429a6db258ab1a7eecbb4e0d44b2
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.andre-simon.de/
-%{?with_apidocs:BuildRequires:	doxygen}
-BuildRequires:	libstdc++-devel
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
+%{?with_apidocs:BuildRequires:	doxygen}
+BuildRequires:	libstdc++-devel
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,6 +44,9 @@ wejściowego.
 Summary:	API documentation for highlight - a source code converter to HTML, XHTML, RTF, TeX, LaTeX, XSL-FO, and XML
 Summary(pl.UTF-8):	Dokumentacja API highlight - konwertera kodu źródłowego do HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API documentation for highlight - a source code converter to HTML,
@@ -88,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # to avoid false `warning: Installed (but unpackaged) file(s) found:' - these files are packaged through %doc
-rm -fr $RPM_BUILD_ROOT/usr/share/doc/highlight
+rm -fr $RPM_BUILD_ROOT%{_docdir}/highlight
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %files gui
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}-gui
 %dir %{_datadir}/%{name}/gui_files
 %dir %{_datadir}/%{name}/gui_files/l10n
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/6dca621b6466270994dc8b0965fe8a10b0e3933d



More information about the pld-cvs-commit mailing list