X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdml.git;a=blobdiff_plain;f=dml.spec;h=7b6af5ea18238dca42aa66644965bdf4758151ea;hp=59b1894a1adfa742898358c12fcaeada2aed16ed;hb=26cb1e89282f8c0534c86cad2abd2f9b1d7c67eb;hpb=d24b7baa15dea8af66f3376c1d54fc72e8476117

diff --git a/dml.spec b/dml.spec
index 59b1894..7b6af5e 100644
--- a/dml.spec
+++ b/dml.spec
@@ -1,16 +1,24 @@
 Summary:	Tool for displaying dialogs from shell
 Summary(pl):	Narzêdzie do wy¶wietlania okien dialogowych z shella
 Name:		dml
-Version:	0.0.5
-Release:	1
+Version:	0.0.12
+Release:	2
 License:	GPL
 Group:		Applications/Terminal
 Group(de):	Applikationen/Terminal
 Group(pl):	Aplikacje/Terminal
 Source0:	ftp://ftp.pld.org.pl/people/malekith/%{name}-%{version}.tar.gz
-BuildRequires:	slang-static
+Patch0:		%{name}-no_new_am.patch
+BuildRequires:	autoconf
+BuildRequires:	automake
+%if %{?BOOT:1}%{!?BOOT:0}
+BuildRequires:	slang-devel-BOOT
+BuildRequires:	uClibc-devel-BOOT
+%endif
+BuildRequires:	slang-devel
 BuildRequires:	gettext-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	slang
 
 %description
 Tool for displaying dialogs from shell.
@@ -30,36 +38,53 @@ Tool for displaying dialogs from shell. Bootdisk version.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
-#autoheader
-automake --add-missing
+autoheader
+aclocal
 autoconf 
+automake -a -c
 
-# --disable-nls does not really work - cannot compile against uClibc
+%if %{?BOOT:1}%{!?BOOT:0}
 %configure --disable-nls
-%{__make} \
-	CFLAGS="-I%{_libdir}/bootdisk%{_includedir}" \
-	LDFLAGS="-nostdlib -s" \
-	LIBS="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc"
+%{__make} -C src \
+	CFLAGS="-m386 -I%{_libdir}/bootdisk%{_includedir}" \
+	LDFLAGS="-nostdlib -static -s" \
+	LDADD="	%{_libdir}/bootdisk%{_libdir}/libslang.a \
+		%{_libdir}/bootdisk%{_libdir}/crt0.o \
+		%{_libdir}/bootdisk%{_libdir}/libc.a -lgcc "
+mv -f src/dml dml-BOOT
+
+%{__make} distclean
+%endif
+
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT 
-install -d -m 755 $RPM_BUILD_ROOT/usr/lib/bootdisk/bin
-install -m 755 src/dml $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/dml
 
-#gzip -9nf AUTHORS TODO ChangeLog
+%if %{?BOOT:1}%{!?BOOT:0}
+install -d $RPM_BUILD_ROOT/usr/lib/bootdisk/bin
+install dml-BOOT $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/dml
+%endif
+
+gzip -9nf AUTHORS TODO NEWS README ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 
+%if %{?BOOT:1}%{!?BOOT:0}
 %files BOOT
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/lib/bootdisk/bin/dml
+%endif