SPECS: anaconda.spec - BR bogl-static - utf-8 locale check for build

glen glen at pld-linux.org
Mon Oct 31 20:30:04 CET 2005


Author: glen                         Date: Mon Oct 31 19:30:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR bogl-static
- utf-8 locale check for build

---- Files affected:
SPECS:
   anaconda.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/anaconda.spec
diff -u SPECS/anaconda.spec:1.5 SPECS/anaconda.spec:1.6
--- SPECS/anaconda.spec:1.5	Tue May  3 20:03:18 2005
+++ SPECS/anaconda.spec	Mon Oct 31 20:29:58 2005
@@ -18,6 +18,7 @@
 BuildRequires:	beecrypt-devel
 BuildRequires:	bogl-bterm >= 0:0.1.9-17
 BuildRequires:	bogl-devel >= 0:0.1.9-17
+BuildRequires:	bogl-static >= 0:0.1.9-17
 BuildRequires:	bzip2-devel
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	elfutils-devel
@@ -39,6 +40,7 @@
 BuildRequires:	python-rpm >= 4.2-0.61
 BuildRequires:	python-urlgrabber
 BuildRequires:	rpm-devel
+BuildRequires:	sed >= 4.0
 BuildRequires:	slang-static
 BuildRequires:	zlib-devel
 BuildRequires:	zlib-static
@@ -92,14 +94,20 @@
 mv -f po/{eu_ES,eu}.po
 mv -f po/{sr,sr at Latn}.po
 
-%build
-mv Makefile Makefile.old
-sed 's/$(PYTHON) scripts/python scripts/' Makefile.old > Makefile
-rm Makefile.old
+sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile
 cp %{SOURCE1} scripts/mk-images
 cp %{SOURCE2} scripts/upd-instroot
 cp %{SOURCE3} scripts/mk-images.i386
 cp %{SOURCE4} scripts/scrubtree
+
+%build
+# locale check
+if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
+	echo >&2 "en_US.utf8 locale not available. build will fail!"
+	echo >&2 "Install glibc-localedb-all or compile it!"
+	exit 1
+fi
+
 %{__make} depend
 %{__make} \
 	RPM_OPT_FLAGS="%{rpmcflags}"
@@ -136,6 +144,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/10/31 19:29:58  glen
+- BR bogl-static
+- utf-8 locale check for build
+
 Revision 1.5  2005/05/03 18:03:18  patrys
 - updated
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/anaconda.spec?r1=1.5&r2=1.6&f=u




More information about the pld-cvs-commit mailing list