X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossavr-libc.spec;h=4870addc26371176a97aeac35e6bd5b548cf6d22;hb=1faab64e3cf6a39643a3104ee722618418dd4480;hp=de65ef7f68a956c8aec806d8ae0261cedfc65495;hpb=9ac8c01a31e604f1f9ffc53c07b1ec65b17b5b19;p=packages%2Fcrossavr-libc.git

diff --git a/crossavr-libc.spec b/crossavr-libc.spec
index de65ef7..4870add 100644
--- a/crossavr-libc.spec
+++ b/crossavr-libc.spec
@@ -1,19 +1,21 @@
 Summary:	AVR libc
-Summary(pl):	libc na AVR
+Summary(pl.UTF-8):	libc na AVR
 Name:		crossavr-libc
-Version:	1.0.4
+Version:	1.4.6
 Release:	1
 Epoch:		1
 License:	Modified BSD (see included LICENSE)
 Group:		Development/Tools
-Source0:	http://savannah.nongnu.org/download/avr-libc/avr-libc-%{version}.tar.bz2
-# Source0-md5:	adc3baf3fb53704b5de2de22f4571ad1
-Source1:	http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
-# Source1-md5:	f336442f27c7c2a002b78056e3ac8801
+Source0:	http://download.savannah.gnu.org/releases/avr-libc/avr-libc-%{version}.tar.bz2
+# Source0-md5:	504b5e3beefc0d500ff94ea88391f71d
+Source1:	http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
+# Source1-md5:	4ed26ca4061aec886209099fa713c6d8
+Source2:	http://download.savannah.gnu.org/releases/avr-libc/avr-libc-manpages-%{version}.tar.bz2
+# Source2-md5:	c80daf3fe433d1a70ad8d91fac951866
 URL:		http://www.nongnu.org/avr-libc/
 BuildRequires:	crossavr-binutils >= 2.14
-BuildRequires:	crossavr-gcc >= 3.3
-Requires:	crossavr-gcc >= 3.3
+BuildRequires:	crossavr-gcc >= 1:3.3
+Requires:	crossavr-gcc >= 1:3.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target		avr
@@ -23,29 +25,34 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 Contains the standard C library for Atmel AVR microcontrollers.
 
-%description -l pl
-Pakiet zawiera standardow± bibliotekê C dla mikrokontrolerów Atmel
+%description -l pl.UTF-8
+Pakiet zawiera standardową bibliotekę C dla mikrokontrolerów Atmel
 AVR.
 
 %prep
-%setup -q -n avr-libc-%{version} -a1
+%setup -q -n avr-libc-%{version} -a1 -a2
 
 %build
-CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
-CONFIG_SHELL="/bin/bash" \
-PREFIX=%{arch}
-./doconf
-./domake
+CFLAGS="%{rpmcflags}" \
+CXXFLAGS="%{rpmcflags}" \
+./configure \
+	--prefix=%{_prefix} \
+	--build=%{_target_platform} \
+	--host=%{target}
+%{__make} \
+	DOC_INST_DIR="%{_datadir}/%{name}-%{version}"
 
 %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}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 cp -rf doc/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -rf man $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT%{_docdir}/avr-libc-%{version}/examples
 
 %if 0%{!?debug:1}
 %{target}-strip -g $RPM_BUILD_ROOT%{arch}/lib/*.[oa] \
@@ -57,12 +64,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.html avr-libc-user-manual-%{version}/ LICENSE README NEWS
+%doc avr-libc-user-manual-%{version}/ ChangeLog LICENSE README NEWS
+%attr(755,root,root) %{_bindir}/*
 %dir %{arch}/include
 %{arch}/include/*.h
 %dir %{arch}/include/avr
 %{arch}/include/avr/*.h
+%dir %{arch}/include/compat
+%{arch}/include/compat/*.h
+%dir %{arch}/include/util
+%{arch}/include/util/*.h
 %{arch}/lib/*.[oa]
-%dir %{arch}/lib/avr?
-%{arch}/lib/avr?/*.[oa]
+%dir %{arch}/lib/avr*
+%{arch}/lib/avr*/*.[oa]
+%{_datadir}/%{name}-%{version}
 %{_examplesdir}/%{name}-%{version}