SPECS: initng.spec - bcond for building the bundled scripts (untes...

[glen]

Author: glen                         Date: Mon Feb  6 01:18:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond for building the bundled scripts (untested/unuseful in pld)

---- Files affected:
SPECS:
   initng.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/initng.spec
diff -u SPECS/initng.spec:1.59 SPECS/initng.spec:1.60
--- SPECS/initng.spec:1.59	Sat Feb  4 13:37:39 2006
+++ SPECS/initng.spec	Mon Feb  6 02:18:11 2006
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_with	gui		# build gui. crashes.
+%bcond_with	dist	# build initscripts from initng distribution
 %bcond_with	plan_b	# use any python-PyKDE, and have kdepyuic copied manually to $PATH
 #
 Summary:	A next generation init replacement
@@ -9,7 +10,7 @@
 Name:		initng
 Version:	0.5.3
 #define	_snap 20051022
-%define	_rel 0.1
+%define	_rel 0.2
 Release:	%{?_snap:0.%{_snap}.}%{_rel}
 License:	GPL v2
 Group:		Base
@@ -18,6 +19,7 @@
 # Source0-md5:	66c2ebc60416b83edae270c71fbdf9ba
 Patch0:		%{name}-savefile.patch
 Patch1:		%{name}-utmpx.patch
+Patch2:		%{name}-no-scripts.patch
 URL:		http://jw.dyndns.org/initng/
 BuildRequires:	/etc/pld-release
 BuildRequires:	autoconf
@@ -112,6 +114,7 @@
 #make[3]: *** [initng_initctl.lo] Error 1
 %patch1 -p1
 %endif
+%{!?with_dist:%patch2 -p1}
 
 %build
 %{__libtoolize}
@@ -126,11 +129,7 @@
 	--disable-install-init \
 	--disable-count-me
 
-#	--with-splash \
-#	--with-splashy \
-
-%{__make} \
-	CPPFLAGS='-DINITNG_PLUGIN_DIR=\"/%{_lib}/%{name}\"'
+%{__make}
 
 %if %{with gui}
 %{__make} generate \
@@ -139,6 +138,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -185,13 +185,7 @@
 %doc doc/imanual.txt doc/initng.txt
 %doc doc/gentoo-chart.png doc/initng-chart.png
 %dir %{_sysconfdir}
-%dir %{_sysconfdir}/daemon
-%dir %{_sysconfdir}/debug
-%dir %{_sysconfdir}/net
-%dir %{_sysconfdir}/system
 %dir %{_libdir}
-%dir %{_libdir}/scripts
-%dir %{_libdir}/scripts/net
 %attr(755,root,root) /%{_lib}/libinitng.so.*.*.*
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_sbindir}/install_service
@@ -202,7 +196,6 @@
 %attr(755,root,root) %{_sbindir}/ngc
 %attr(755,root,root) %{_sbindir}/ngdc
 %attr(755,root,root) %{_sbindir}/system_off
-%attr(755,root,root) %{_prefix}%{_sbindir}/ngcupdown
 %{_mandir}/man8/initng.8*
 %{_mandir}/man8/ngc.8*
 %{_mandir}/man8/ng-update.8*
@@ -217,6 +210,7 @@
 %attr(755,root,root) %{_bindir}/*.py
 %endif
 
+%if %{with dist}
 %files fixes
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/pcmcia/network
@@ -228,7 +222,11 @@
 %files initscripts
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/killalli5
+%dir %{_sysconfdir}/daemon
 %dir %{_sysconfdir}/daemon/bluetooth
+%dir %{_sysconfdir}/debug
+%dir %{_sysconfdir}/net
+%dir %{_sysconfdir}/system
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.i
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/daemon/*.i
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/daemon/bluetooth/*.i
@@ -237,8 +235,11 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/net/*.i
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.runlevel
 %config(noreplace) %verify(not md5 mtime size) %{_libdir}/service_alias
+%attr(755,root,root) %{_prefix}%{_sbindir}/ngcupdown
 %attr(755,root,root) %{_sbindir}/gen_system_runlevel
 %attr(755,root,root) %{_sbindir}/shutdown_script
+%dir %{_libdir}/scripts
+%dir %{_libdir}/scripts/net
 %attr(755,root,root) %{_libdir}/scripts/net/dhclient-wrapper
 %attr(755,root,root) %{_libdir}/scripts/net/dhcp
 %attr(755,root,root) %{_libdir}/scripts/net/dhcpcd-backgrounder
@@ -253,6 +254,7 @@
 %attr(755,root,root) %{_libdir}/scripts/net/udhcpc-wrapper
 %attr(755,root,root) %{_libdir}/scripts/net/wpa_supplicant
 %attr(755,root,root) %{_libdir}/scripts/net/wpa_cli.action
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -260,6 +262,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/02/06 01:18:11  glen
+- bcond for building the bundled scripts (untested/unuseful in pld)
+
 Revision 1.59  2006/02/04 12:37:39  glen
 - cleanups, deps fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.59&r2=1.60&f=u