- added manpages

- fixed avr-man tool to read proper manpages

Changed files:
    crossavr-libc.spec -> 1.24

diff --git a/crossavr-libc.spec b/crossavr-libc.spec
index c4f2dd2e86d2df203fd26ba47036ac42987ea0a9..402c1ddfd0780241fc1fd3ca0071b8c832ac0923 100644 (file)
--- a/crossavr-libc.spec
+++ b/crossavr-libc.spec
@@ -2,7 +2,7 @@ Summary:        AVR libc
 Summary(pl):   libc na AVR
 Name:          crossavr-libc
 Version:       1.2.6
 Summary(pl):   libc na AVR
 Name:          crossavr-libc
 Version:       1.2.6

-Release:       1
+Release:       2

 Epoch:         1
 License:       Modified BSD (see included LICENSE)
 Group:         Development/Tools
 Epoch:         1
 License:       Modified BSD (see included LICENSE)
 Group:         Development/Tools


@@ -10,9 +10,12 @@ Source0:     http://savannah.nongnu.org/download/avr-libc/avr-libc-%{version}.tar.bz
 # Source0-md5: 481c280ae3e66f071bf4a74af3565539
 Source1:       http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
 # Source1-md5: cfa1a9768488aa96b4a55dd6aeb6c62f
 # Source0-md5: 481c280ae3e66f071bf4a74af3565539
 Source1:       http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
 # Source1-md5: cfa1a9768488aa96b4a55dd6aeb6c62f

+Source2:       http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-%{version}.bz2
+# Source2-md5: 1ec7091540538919e1ada2841757dc3e

 URL:           http://www.nongnu.org/avr-libc/
 BuildRequires: crossavr-binutils >= 2.14
 BuildRequires: crossavr-gcc >= 3.3
 URL:           http://www.nongnu.org/avr-libc/
 BuildRequires: crossavr-binutils >= 2.14
 BuildRequires: crossavr-gcc >= 3.3

+BuildRequires: sed >= 4.0

 Requires:      crossavr-gcc >= 3.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Requires:      crossavr-gcc >= 3.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -28,9 +31,11 @@ Pakiet zawiera standardow
 AVR.
 
 %prep
 AVR.
 
 %prep

-%setup -q -n avr-libc-%{version} -a1
+%setup -q -n avr-libc-%{version} -a1 -a2

 
 %build
 
 %build

+sed -i -e 's|@DOC_INST_DIR@|%{_datadir}/%{name}-%{version}|' scripts/avr-man.in
+

 CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
 CONFIG_SHELL="/bin/bash" \
 PREFIX=%{arch}
 CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
 CONFIG_SHELL="/bin/bash" \
 PREFIX=%{arch}


@@ -40,12 +45,14 @@ PREFIX=%{arch}
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_prefix}
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_prefix}

+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} -C build install \
        prefix=$RPM_BUILD_ROOT%{_prefix}
 
 cp -rf doc/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} -C build install \
        prefix=$RPM_BUILD_ROOT%{_prefix}
 
 cp -rf doc/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}

+cp -rf man $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

 
 %if 0%{!?debug:1}
 %{target}-strip -g $RPM_BUILD_ROOT%{arch}/lib/*.[oa] \
 
 %if 0%{!?debug:1}
 %{target}-strip -g $RPM_BUILD_ROOT%{arch}/lib/*.[oa] \


@@ -68,4 +75,5 @@ rm -rf $RPM_BUILD_ROOT
 %{arch}/lib/*.[oa]
 %dir %{arch}/lib/avr?
 %{arch}/lib/avr?/*.[oa]
 %{arch}/lib/*.[oa]
 %dir %{arch}/lib/avr?
 %{arch}/lib/avr?/*.[oa]

+%{_datadir}/%{name}-%{version}

 %{_examplesdir}/%{name}-%{version}
 %{_examplesdir}/%{name}-%{version}