Author: glen Date: Wed Jul 20 10:57:56 2011 GMT Module: packages Tag: HEAD ---- Log message: - flags, doc deps
---- Files affected: packages/btmgr: btmgr.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/btmgr/btmgr.spec diff -u packages/btmgr/btmgr.spec:1.1 packages/btmgr/btmgr.spec:1.2 --- packages/btmgr/btmgr.spec:1.1 Wed Jul 20 12:24:54 2011 +++ packages/btmgr/btmgr.spec Wed Jul 20 12:57:50 2011 @@ -14,7 +14,10 @@ URL: http://sourceforge.net/projects/btmgr/ BuildRequires: nasm BuildRequires: sed >= 4.0 -%{?with_doc:BuildRequires: sgml-tools} +%if %{with doc} +BuildRequires: sgml-tools +BuildRequires: tetex-format-latex +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -29,11 +32,21 @@ %prep %setup -q -n %{name}-%{version}-1 -%{__sed} -i -e '/^CC=/ s/gcc/%{__cc}/' Makefile +# allow passing defaults +%{__sed} -i -e '/^CC=/ s/gcc/$(HOSTCC)/' Makefile +%{__sed} -i -e '/^COMMON_FLAGS=/ s/-g/$(CFLAGS)/' Makefile +%{__sed} -i -e '/^ASM=/ s/$/ $(AFLAGS)/' Makefile + +# we run docs in bcond %{__sed} -i -e '/^SUBDIRS=/ s/docs//' Makefile +# pipe breaks error handling +%{__sed} -i -e '/(MAKE)/ s/|tee -a errors.log//' Makefile %build -%{__make} +%{__make} \ + HOSTCC="%{__cc}" \ + CFLAGS="%{rpmcflags}" \ + AFLAGS="-w-orphan-labels" %{?with_doc:%{__make} -C docs} @@ -58,5 +71,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/07/20 10:57:50 glen +- flags, doc deps + Revision 1.1 2011/07/20 10:24:54 glen - new also known as sbootmgr.dsk. based on src.rpm .spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/btmgr/btmgr.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
