diff --git a/.gitignore b/.gitignore index 0656060..2c4360a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/initscripts-9.42.tar.bz2 /initscripts-9.42.1.tar.bz2 diff --git a/65173d7.patch b/65173d7.patch new file mode 100644 index 0000000..90c4652 --- /dev/null +++ b/65173d7.patch @@ -0,0 +1,30 @@ +commit 65173d72f1a662a8596aa0e14232556ba40e452f (HEAD, origin/master, origin/HEAD, master) +Author: Bill Nottingham +Date: Fri Dec 7 16:21:59 2012 -0500 + + Fix build. + +diff --git a/Makefile b/Makefile +index 1c6bce8..c6fc7a0 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,6 +22,7 @@ install: + install -m644 adjtime $(ROOT)/etc + install -m644 inittab $(ROOT)/etc + install -m644 rwtab statetab networks $(ROOT)/etc ++ install -m755 service $(ROOT)/sbin + install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d + install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d + install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d +diff --git a/initscripts.spec b/initscripts.spec +index ce34c7f..c7f3a1c 100644 +--- a/initscripts.spec ++++ b/initscripts.spec +@@ -175,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT + %exclude /etc/profile.d/debug* + /etc/profile.d/* + /usr/sbin/sys-unconfig +-/sbin/setsysfont + /bin/ipcalc + /bin/usleep + %attr(4755,root,root) /usr/sbin/usernetctl diff --git a/initscripts.spec b/initscripts.spec index d99a80e..52fb13a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -30,6 +30,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch1: 65173d7.patch %description The initscripts package contains the basic system scripts used to boot @@ -50,6 +51,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 %build make @@ -173,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig -/sbin/setsysfont /bin/ipcalc /bin/usleep %attr(4755,root,root) /usr/sbin/usernetctl diff --git a/sources b/sources index 20ca2a2..c9f076e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d5bde672cc94973cd8af8ac0354dbe8f initscripts-9.42.tar.bz2 43b416b9deeef09f917b7e1304fa6af1 initscripts-9.42.1.tar.bz2