From 3587311855796fbbaf96835bb20a95bbd09f42a9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 5 Jan 2010 06:07:48 +0000
Subject: [PATCH] - up to 1.091; doc subpackage

Changed files:
    aap-FHS.patch -> 1.2
    aap.spec -> 1.7
---
 aap-FHS.patch | 13 ++++++++++---
 aap.spec      | 51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/aap-FHS.patch b/aap-FHS.patch
index 7123317..3e88b0a 100644
--- a/aap-FHS.patch
+++ b/aap-FHS.patch
@@ -1,6 +1,13 @@
---- aap-1.090/main.aap~	2005-06-01 17:37:50.000000000 +0300
-+++ aap-1.090/main.aap	2009-01-18 23:53:47.712943686 +0200
-@@ -53,7 +53,7 @@
+--- aap-1.090/main.aap	2009-01-18 23:53:47.712943686 +0200
++++ aap-1.091/main.aap	2010-01-05 07:58:12.308951140 +0200
+@@ -47,13 +47,13 @@
+ 				    stdin).group(1) | :assign Version
+ 
+ 	# Directories to be used.
+-	dir = $PREFIX/lib/aap/Exec-$Version
++	dir = $PREFIX/share/aap
+ 	toolsdir = $dir/tools
+ 	modulesdir = $dir/modules
  	docdir = $dir/doc
  	htmldocdir = $docdir$?HTMLDIR
  	bindir = $PREFIX/bin
diff --git a/aap.spec b/aap.spec
index a0a8e0d..85652bb 100644
--- a/aap.spec
+++ b/aap.spec
@@ -1,17 +1,22 @@
+#
+# Conditional build:
+%bcond_without	doc		# don't build doc package
+
 Summary:	A-A-P - tool to locate, download, build and install software
 Summary(pl.UTF-8):	A-A-P - narzędzie do ściągania, budowania i instalowania oprogramowania
 Name:		aap
-Version:	1.090
+Version:	1.091
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/a-a-p/%{name}-%{version}.zip
-# Source0-md5:	6fef135ef229ba6c5aea57aa1a9b8c71
+# Source0-md5:	6c7820e7596bd5be5cde29030d3cdf3b
 Patch0:		%{name}-FHS.patch
 URL:		http://www.a-a-p.org/
 BuildRequires:	python >= 1:2.3
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Requires:	python >= 1:2.3
 BuildArch:	noarch
@@ -30,9 +35,17 @@ programów, zarządzanie różnymi wersjami oraz dystrybucję
 oprogramowania i dokumentacji. Oznacza to, że A-A-P jest przydatny
 zarówno dla użytkowników, jak i programistów.
 
+%package doc
+Summary:	HTML Documentation for A-A-P
+Group:		Documentation
+
+%description doc
+HTML Documentation for A-A-P.
+
 %prep
-%setup -q -c
+%setup -qc
 %patch0 -p1
+grep -r env.python -l . | xargs %{__sed} -i -e '1s,#!.*bin/env python,#!%{__python},'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,27 +54,31 @@ install -d $RPM_BUILD_ROOT%{_datadir}
 ./aap install \
 	PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-ln -snf %{_prefix}/lib/aap/Exec-%{version}/aap $RPM_BUILD_ROOT%{_bindir}/aap
+ln -snf %{_datadir}/%{name}/aap $RPM_BUILD_ROOT%{_bindir}/aap
 
-%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/aap/Exec-%{version}
-%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/aap/Exec-%{version}/tools
-%py_postclean %{_prefix}/lib/aap
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}}/%{name}/tools
+%py_postclean %{_datadir}/%{name}
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/aap/Exec-%{version}/{doc,README.txt,COPYING}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{doc,README.txt,COPYING}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{*.html,*.pdf,images}
 %attr(755,root,root) %{_bindir}/aap
-%dir %{_prefix}/lib/aap
-%dir %{_prefix}/lib/aap/Exec-%{version}
-%attr(755,root,root) %{_prefix}/lib/aap/Exec-%{version}/aap
-%{_prefix}/lib/aap/Exec-%{version}/*.py[co]
-%{_prefix}/lib/aap/Exec-%{version}/default.aap
-%{_prefix}/lib/aap/Exec-%{version}/modules
-%dir %{_prefix}/lib/aap/Exec-%{version}/tools
-%{_prefix}/lib/aap/Exec-%{version}/tools/*.py[co]
+%dir %{_datadir}/%{name}
+%attr(755,root,root) %{_datadir}/%{name}/aap
+%{_datadir}/%{name}/*.py[co]
+%{_datadir}/%{name}/default.aap
+%{_datadir}/%{name}/modules
+%dir %{_datadir}/%{name}/tools
+%{_datadir}/%{name}/tools/*.py[co]
 %{_mandir}/man1/aap.1*
+
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc doc/{*.html,*.pdf,images}
+%endif
-- 
2.44.0