From 1c3c6e0e69b4731bb1e612fafe64ee8324286a87 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 14 Jan 2003 00:24:32 +0000
Subject: just use /usr/share/locale ; you need glibc locale stuff anyway...

---
 Makefile              |  4 ----
 initscripts.spec      | 10 ----------
 po/Makefile           |  2 +-
 rc.d/init.d/functions |  1 -
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index a30f176a..31926b1d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,10 +60,6 @@ install:
 	make install ROOT=$(ROOT) mandir=$(mandir) -C src
 	make install PREFIX=$(ROOT) -C po
 
-# Make sure locale stuff from initscripts goes in /usr/share/locale too
-	mkdir -p $(ROOT)/usr/share/locale
-	cp -a $(ROOT)/etc/locale/* $(ROOT)/usr/share/locale/
-
 	mkdir -p $(ROOT)/var/run/netreport $(ROOT)/var/log
 	chown $(SUPERUSER).$(SUPERGROUP) $(ROOT)/var/run/netreport
 	chmod u=rwx,g=rwx,o=rx $(ROOT)/var/run/netreport
diff --git a/initscripts.spec b/initscripts.spec
index e3634ff0..e845a9a4 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -50,13 +50,6 @@ for foo in * ; do
 done
 popd
 
-pushd  %{buildroot}/etc/locale
-for foo in * ; do
-	echo "%lang($foo) /etc/locale/$foo/*/*" >> \
-	$RPM_BUILD_DIR/%{name}-%{version}/trans.list
-done
-popd
-
 %ifnarch s390 s390x
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
@@ -251,9 +244,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
-%dir /etc/locale
-%dir /etc/locale/*
-%dir /etc/locale/*/LC_MESSAGES
 
 %changelog
 * Fri Dec 20 2002 Bill Nottingham <notting@redhat.com> 7.01-1
diff --git a/po/Makefile b/po/Makefile
index b44f03e1..d0eb0f30 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
 INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
-INSTALLNLSDIR=/etc/locale
+INSTALLNLSDIR=/usr/share/locale
 
 MSGMERGE = msgmerge
 
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index bd470a09..e13042d0 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -5,7 +5,6 @@
 #
 
 TEXTDOMAIN=initscripts
-TEXTDOMAINDIR=/etc/locale
 
 # Make sure umask is sane
 umask 022
-- 
cgit v1.2.1