SPECS: initng.spec - updated to modular 0.6.0RC1 - gui dropped - f...
glen
glen at pld-linux.org
Wed Mar 22 19:14:21 CET 2006
Author: glen Date: Wed Mar 22 18:14:21 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to modular 0.6.0RC1
- gui dropped
- fixes,initscripts are now from initng-ifiles
- created -devel package
---- Files affected:
SPECS:
initng.spec (1.68 -> 1.69)
---- Diffs:
================================================================
Index: SPECS/initng.spec
diff -u SPECS/initng.spec:1.68 SPECS/initng.spec:1.69
--- SPECS/initng.spec:1.68 Mon Mar 13 22:06:38 2006
+++ SPECS/initng.spec Wed Mar 22 19:14:16 2006
@@ -1,25 +1,18 @@
# $Revision$, $Date$
-#
-# 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
-#
-#define _pre pre1
+%define _rc RC1
#define _snap 20051022
-%define _rel 0.2
+%define _rel 0.1
Summary: A next generation init replacement
Summary(pl): Zamiennik inita następnej generacji
Name: initng
-Version: 0.5.5
+Version: 0.6.0
Release: %{?_snap:0.%{_snap}.}%{?_pre:0.%{_pre}.}%{_rel}
License: GPL v2
Group: Base
-Source0: http://download.initng.thinktux.net/v0.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 969c44d1b020f55db5f2e03473428c31
+Source0: http://download.initng.thinktux.net/v0.6/%{name}-%{version}%{_rc}.tar.bz2
+# Source0-md5: 4e29074adacaee1285e0f60fdc3a18c3
Patch0: %{name}-savefile.patch
Patch1: %{name}-utmpx.patch
-Patch2: %{name}-no-scripts.patch
Patch3: %{name}-vserver.patch
URL: http://jw.dyndns.org/initng/
BuildRequires: /etc/pld-release
@@ -28,12 +21,6 @@
BuildRequires: libtool
BuildRequires: rpmbuild(macros) >= 1.194
BuildRequires: sed >= 4.0
-%if %{with gui}
-BuildRequires: python-PyKDE
-# plan B means that you manually cp kdepyuic to your $PATH:
-# cp ../BUILD/PyKDE-snapshot20051013/contrib/kdepyuic /usr/bin
-%{!?with_plan_b:BuildRequires: python-PyKDE >= 4.0.0}
-%endif
Requires(post): /sbin/ldconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,55 +45,15 @@
szybszy start systemu uniksowego oraz zapewnia większą kontrolę i
statystyki.
-%package gui
-Summary: InitNG GUI
-Summary(pl): Graficzny interfejs do InitNG
-Group: X11/Applications
-Requires: python
-Requires: python-PyKDE
-Requires: python-PyQt
-
-%description gui
-InitNG Runlevel Editor with DCOP support.
-
-%description gui -l pl
-Edytor poziomów działania InitNG z obsługą DCOP.
-
-# just temp placeholder for those scripts
-%package fixes
-Summary: initng experimental patches and fixes
-Summary(pl): Eksperymentalne łaty i poprawki do initng
-Group: Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description fixes
-Contains fixes directory from initng distribution, which appear to
-replace few system files. You should probably install this package
-with --replacefiles rpm option.
-
-%description fixes -l pl
-Ten pakiet zawiera katalog fixes z dystrybucji initng, który wydaje
-się zastępować niektóre pliki systemowe. Prawdopodobnie należy
-instalować ten pakiet z opcją rpm-a --replacefiles.
-
-%package initscripts
-Summary: Bundled initscripts
-Summary(pl): Dołączone skrypty inicjalizujące
-Group: Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: bash
+%package devel
+Summary: Header files for initng
+Group: Development/Libraries
-%description initscripts
-This package contains the bundled iniscripts. These are very
-gentooish. I plan to write new ones for PLD using existing rc-scripts.
-
-%description initscripts -l pl
-Ten pakiet zawiera dołączone skrypty inicjalizujące. Są bardzo
-gentoowskie. Planowane jest napisanie nowych dlaPLD przy użyciu
-istniejących rc-scripts.
+%description devel
+Header files for initng.
%prep
-%setup -q -n %{name}%{!?_snap:-%{version}}%{?_pre:_%{_pre}}
+%setup -q -n %{name}%{!?_snap:-%{version}}%{?_pre:_%{_pre}}%{?_rc}
%patch0 -p1
%ifnarch amd64
# patch needs fixing:
@@ -115,8 +62,7 @@
#make[3]: *** [initng_initctl.lo] Error 1
%patch1 -p1
%endif
-%{!?with_dist:%patch2 -p1}
-%patch3 -p1
+#%patch3 -p1
%build
%{__libtoolize}
@@ -133,11 +79,6 @@
%{__make}
-%if %{with gui}
-%{__make} generate \
- -C gui/runlevelEditor
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}
@@ -145,25 +86,14 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# install test_parser program, which will help you check your .i files
-# validity
+# install test_parser program, which will help you check your .i files validity
libtool --mode=install cp devtool/test_parser $RPM_BUILD_ROOT%{_sbindir}/%{name}-test_parser
-
-%if %{with gui}
-cd gui/runlevelEditor
-install InitNGRunlevelEditor.py $RPM_BUILD_ROOT%{_bindir}
-install initng.py $RPM_BUILD_ROOT%{_bindir}
-%endif
-
-# no devel package, so no devel files
-rm -f $RPM_BUILD_ROOT/%{_lib}/libinitng.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# duplicated
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
# should be in sysconfig probably
rm -f $RPM_BUILD_ROOT%{_libdir}/service_alias
# bug probably
-for a in nghalt ngreboot ngrestart ngstart ngstatus ngstop ngzap ngdc; do
+for a in ngdc nghalt ngreboot ngrestart ngstart ngstatus ngstop ngzap; do
ln -sf ngc $RPM_BUILD_ROOT%{_sbindir}/$a
done
@@ -190,16 +120,15 @@
%files
%defattr(644,root,root,755)
%doc README AUTHORS ChangeLog NEWS TEMPLATE_HEADER TODO CODING_STANDARDS
-%doc doc/imanual.txt doc/initng.txt
+%doc doc/initng.txt
%doc doc/gentoo-chart.png doc/initng-chart.png
%dir %{_sysconfdir}
%dir %{_libdir}
%attr(755,root,root) /%{_lib}/libinitng.so.*.*.*
+%attr(755,root,root) /%{_lib}/libngeclient.so.*.*.*
%attr(755,root,root) %{_libdir}/lib*.so
%attr(755,root,root) %{_sbindir}/initng
-%attr(755,root,root) %{_sbindir}/initng-segfault
%attr(755,root,root) %{_sbindir}/initng-test_parser
-%attr(755,root,root) %{_sbindir}/ng-update
%attr(755,root,root) %{_sbindir}/ngc
%attr(755,root,root) %{_sbindir}/ngdc
%attr(755,root,root) %{_sbindir}/nghalt
@@ -209,66 +138,20 @@
%attr(755,root,root) %{_sbindir}/ngstatus
%attr(755,root,root) %{_sbindir}/ngstop
%attr(755,root,root) %{_sbindir}/ngzap
-%attr(755,root,root) %{_sbindir}/system_off
+%attr(755,root,root) %{_sbindir}/ngde
+%attr(755,root,root) %{_sbindir}/nge
+%attr(755,root,root) %{_sbindir}/nge_raw
%{_mandir}/man8/initng.8*
%{_mandir}/man8/ngc.8*
-%{_mandir}/man8/ng-update.8*
%{_mandir}/man8/ngdc.8*
-%if %{with gui}
-%files gui
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*.py
-%endif
-
-%if %{with dist}
-%files fixes
+%files devel
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/pcmcia/network
-%config(noreplace) %verify(not md5 mtime size) /etc/hotplug/net.agent
-%attr(755,root,root) %{_prefix}%{_sbindir}/ifplugd.action
-%attr(755,root,root) %{_prefix}%{_sbindir}/wpa_cli.action
-/etc/ifplugd/action.d/ngcupdown
-
-%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
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/debug/*.i
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system/*.i
-%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
-%attr(755,root,root) %{_sbindir}/install_service
-%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
-%attr(755,root,root) %{_libdir}/scripts/net/essidnet
-%attr(755,root,root) %{_libdir}/scripts/net/functions
-%attr(755,root,root) %{_libdir}/scripts/net/gentoo-functions
-%attr(755,root,root) %{_libdir}/scripts/net/ifconfig
-%attr(755,root,root) %{_libdir}/scripts/net/interface
-%attr(755,root,root) %{_libdir}/scripts/net/iproute2
-%attr(755,root,root) %{_libdir}/scripts/net/iwconfig
-%attr(755,root,root) %{_libdir}/scripts/net/system
-%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
-%{_mandir}/man8/install_service.8*
-%{_mandir}/man8/gen_system_runlevel.8*
-%endif
+/%{_lib}/libngeclient.la
+/%{_lib}/libngeclient.so
+/%{_lib}/libinitng.la
+%{_libdir}/*.la
+%{_includedir}/initng
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -276,6 +159,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.69 2006/03/22 18:14:16 glen
+- updated to modular 0.6.0RC1
+- gui dropped
+- fixes,initscripts are now from initng-ifiles
+- created -devel package
+
Revision 1.68 2006/03/13 21:06:38 glen
- add vserver patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.68&r2=1.69&f=u
More information about the pld-cvs-commit
mailing list