rpms/initng-ifiles/devel newrpms-initng-ifiles-dbus.patch, NONE, 1.1 newrpms-initng-ifiles-nm.patch, NONE, 1.1 initng-ifiles.spec, 1.10, 1.11

Daniel Malmgren (danielm) fedora-extras-commits at redhat.com
Wed Oct 31 20:16:37 UTC 2007


Author: danielm

Update of /cvs/extras/rpms/initng-ifiles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5919

Modified Files:
	initng-ifiles.spec 
Added Files:
	newrpms-initng-ifiles-dbus.patch 
	newrpms-initng-ifiles-nm.patch 
Log Message:
initng-ifiles-0.1.4-4 for devel


newrpms-initng-ifiles-dbus.patch:

--- NEW FILE newrpms-initng-ifiles-dbus.patch ---
--- initfiles/daemon/dbus.ii.old	2007-10-27 02:01:52.000000000 +0200
+++ initfiles/daemon/dbus.ii	2007-10-27 02:03:03.000000000 +0200
@@ -13,8 +13,7 @@
 	env PIDFILE = ${PIDDIR}/pid;
 	env_file = /etc/default/dbus;
 	pid_file = ${PIDFILE};
-#endd
-#ifd pingwinek sourcemage
+#elsed pingwinek sourcemage
 	pid_file = /var/run/dbus/pid;
 #elsed
 	pid_file = /var/run/dbus.pid;

newrpms-initng-ifiles-nm.patch:

--- NEW FILE newrpms-initng-ifiles-nm.patch ---
--- initfiles/daemon/NetworkManager.ii.old	2007-10-26 17:41:55.000000000 +0200
+++ initfiles/daemon/NetworkManager.ii	2007-10-26 17:42:14.000000000 +0200
@@ -13,7 +13,7 @@
 }
 
 daemon daemon/NetworkManager {
-	need = system/bootmisc daemon/dbus daemon/NetworkManager/prepare system/modules/capability daemon/hald daemon/dhcdbd;
+	need = system/bootmisc daemon/dbus daemon/NetworkManager/prepare system/modules/capability daemon/hald;
 	provide = virtual/net;
 	env PID_FILE = /var/run/NetworkManager/NetworkManager.pid;
 	exec daemon  = @/usr/sbin/NetworkManager@ --pid-file=${PID_FILE};


Index: initng-ifiles.spec
===================================================================
RCS file: /cvs/extras/rpms/initng-ifiles/devel/initng-ifiles.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- initng-ifiles.spec	23 Aug 2007 18:18:42 -0000	1.10
+++ initng-ifiles.spec	31 Oct 2007 20:15:59 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Scripts for initng
 Name: initng-ifiles
 Version: 0.1.4
-Release: 2%{?dist}
+Release: 3.7%{?dist}
 License: GPL
 URL: http://www.initng.org
 Group: System Environment/Base
@@ -11,31 +11,80 @@
 Requires: filesystem
 Provides: initng(ifiles)
 Patch0: rpcbindrsyslogd.patch
+Patch1: newrpms-initng-ifiles-nm.patch
+Patch2: newrpms-initng-ifiles-dbus.patch
+
 
 %description
 Initng is a full replacement of the old and in many ways deprecated sysvinit
 tool. This package contains all script files needed to run initng
 
+
 %prep
 %setup -q
 %patch0 -p0 -b .rpcbindrsyslogd
+%patch1 -p0
+%patch2 -p0
+
+
+### fixing the paths (should be diffed and merged with upstream)
+for file in $(grep -l @mount@ */*/*); do
+mv $file $file.old
+sed 's|@mount@|@/bin/mount@|' $file.old > $file
+done
+
+for file in $(grep -l @awk@ */*/*); do
+mv $file $file.old
+sed 's|@awk@|@/usr/bin/awk@|' $file.old > $file
+done
+
+for file in $(grep -l @logsave@ */*/*); do
+mv $file $file.old
+sed 's|@logsave@|@/sbin/logsave@|' $file.old > $file
+done
+
+for file in $(grep -l @killalli5:killall5@ */*/*); do
+mv $file $file.old
+sed 's|@killalli5:killall5@|@/sbin/killalli5:/sbin/killall5@|' $file.old > $file
+done
+
+for file in $(grep -l @dmesg@ */*/*); do
+mv $file $file.old
+sed 's|@dmesg@|@/bin/dmesg@|' $file.old > $file
+done
+
+for file in $(grep -l @/sbin/dmesg@ */*/*); do
+mv $file $file.old
+sed 's|@/sbin/dmesg@|@/bin/dmesg@|' $file.old > $file
+done
+
+for file in $(grep -l @fsck@ */*/*); do
+mv $file $file.old
+sed 's|@fsck@|@/sbin/fsck@|' $file.old > $file
+done
+
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 cmake . -DLIB_INSTALL_DIR:STRING=/%{_lib}
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
+
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent
 rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network
+
+### lets bring that upstream or split it out
 rm -rf %{buildroot}%{_datadir}/vim/
+
 rm -rf %{buildroot}/%{_lib}/libgenrunlevel.gentoo
 rm -rf %{buildroot}/%{_lib}/libgenrunlevel.debian
 mkdir _doc
 mv %{buildroot}%{_datadir}/doc/%{name}/* _doc/
 
+
 %post
 if [ $1 = 1 ]; then
   /sbin/genrunlevel --all >/dev/null 2>&1 || :
@@ -44,11 +93,14 @@
 fi
 exit 0
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc _doc/*
@@ -61,6 +113,17 @@
 %{_mandir}/*/*
 
 %changelog
+* Sat Oct 29 2007 Rudolf Kastl <che666 at gmail.com> 0.1.4-4
+- Fixed another typo in the svn backport
+- Changed rpcbind need to virtual/net/lo in svn backport
+- Fixed thinko in dbus.ii
+
+* Fri Oct 28 2007 Rudolf Kastl <che666 at gmail.com> 0.1.4-3
+- Fixed paths for alot binaries to avoid buildreqs and make 
+  everything boot actually
+- Fixed the patch for udev to stop the hangs on boot
+- Turned on verbosity when building
+
 * Thu Aug 23 2007 Daniel Malmgren <dm at mensa.se> 0.1.4-2
 - Added patch from upstreams to fix bug #239829 and #248668
   and replace syslogd and klogd with rsyslogd and rklogd




More information about the fedora-extras-commits mailing list