[initscripts] Fix build

Bill Nottingham notting at fedoraproject.org
Fri Dec 7 21:26:05 UTC 2012


commit 842dab63cc1e63bddbef9f0d5dde5dc71c43acf2
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Dec 7 16:25:30 2012 -0500

    Fix build

 .gitignore       |    1 -
 65173d7.patch    |   30 ++++++++++++++++++++++++++++++
 initscripts.spec |    3 ++-
 sources          |    1 -
 4 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3edbd0b..d778885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/initscripts-9.42.tar.bz2
 /initscripts-9.43.tar.bz2
diff --git a/65173d7.patch b/65173d7.patch
new file mode 100644
index 0000000..0b72acd
--- /dev/null
+++ b/65173d7.patch
@@ -0,0 +1,30 @@
+commit 65173d72f1a662a8596aa0e14232556ba40e452f (origin/master, origin/HEAD, master)
+Author: Bill Nottingham <notting at redhat.com>
+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 ce34c7f..758eaab 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -32,6 +32,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
@@ -52,6 +53,7 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 make
@@ -175,7 +177,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 b27f10a..18346ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d5bde672cc94973cd8af8ac0354dbe8f  initscripts-9.42.tar.bz2
 a225c9b7b0786e395b38a4d919e7d72f  initscripts-9.43.tar.bz2


More information about the scm-commits mailing list