Author: glen                         Date: Thu Jul 28 21:41:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.1.5

---- Files affected:
SPECS:
   initng.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/initng.spec
diff -u SPECS/initng.spec:1.12 SPECS/initng.spec:1.13
--- SPECS/initng.spec:1.12      Tue Jul  5 18:37:18 2005
+++ SPECS/initng.spec   Thu Jul 28 23:41:42 2005
@@ -4,23 +4,28 @@
 Summary:       A next generation init replacement
 Summary(pl):   Zamiennik inita następnej generacji
 Name:          initng
-Version:       0.1.3
+Version:       0.1.5
 Release:       0.6
 Epoch:         0
 License:       GPL v2
 Group:         Base
 Source0:       http://initng.thinktux.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: de9cb47d71792a1a9d47029549d0dfcc
-Patch0:                %{name}-FHS.patch
+# Source0-md5: 289b97f6a6e221b7e1970003a07f2e21
+Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-lib64.patch
 URL:           http://jw.dyndns.org/initng/
 BuildRequires: sed >= 4.0
 Requires:      bash
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/%{name}
-%define                _sbindir        /sbin
-%define                _libdir         /%{_lib}/initng
+%define                _prefix                 /
+%define                _sysconfdir             /etc/%{name}
+%define                _libdir                 /%{_lib}/%{name}
+%define                _sbindir                /sbin
+# for broken initng ac files prefix needs to be / and these redefined
+%define                _datadir                /usr/share
+%define                _docdir                 %{_datadir}/doc
+%define                _mandir                 %{_datadir}/man
 
 %description
 Initng is a full replacement of the old and in many ways deprecated
@@ -36,86 +41,90 @@
 szybszy start systemu uniksowego oraz zapewnia większą kontrolę i
 statystyki.
 
+# just temp place holder for those scripts
+%package fixes
+Summary:       Various fixes
+Group:         Base
+
+%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.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
+exit 0
 grep -rl '/lib/initng' . | xargs sed -i -e '
        s,\$(DESTDIR)/lib,$(DESTDIR)/%{_lib},g
        s,/lib/initng,/%{_lib}/initng,g
 '
 
 %build
-%{__make} -C ngcontrol \
-       CFLAGS='%{rpmcflags}' \
-       LDFLAGS='%{rpmldflags}'
+%configure \
+       --sysconfdir=/etc \
+       --libdir=/%{_lib} \
 
-%{__make} -C src \
+%{__make} \
        CFLAGS='-DINITNG_PLUGIN_DIR=\"/%{_lib}/%{name}\" %{rpmcflags}' \
        LDFLAGS='%{rpmldflags}'
 
+# bug
+chmod 600 initfiles/net/net.i
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       LIBDIR=%{_lib} \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf libinitng.so.0.0 $RPM_BUILD_ROOT/%{_lib}/libinitng.so.0
-ln -sf libinitng.so.0.0 $RPM_BUILD_ROOT/%{_lib}/libinitng.so
-# TODO
-rm -f $RPM_BUILD_ROOT/etc/hotplug/net.agent
+DESTDIR=$RPM_BUILD_ROOT ./gen_system_runlevel.sh
+
+# 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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ "$1" = 1 ]; then
-       echo >&2 "Remember to add init=/sbin/initng in your grub or lilo config 
to use initng"
+       echo >&2 "Remember to add init=%{_sbindir}/initng in your grub or lilo 
config to use initng"
        echo >&2 "Happy testing."
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog NEWS TEMPLATE_HEADER TODO CODING_STANDARDS
-%doc doc/databases.txt doc/empty.conf doc/hard.conf
-%doc fixes/
+%doc doc/databases.txt doc/imanual.txt doc/initng.txt
+%doc doc/empty.conf doc/hard.conf
+%doc doc/gentoo-chart.png doc/initng-chart.png
 
-#%config(noreplace) %verify(not md5 mtime size) /etc/hotplug/net.agent
 %config(noreplace) %verify(not md5 mtime size) /etc/initng/plugin/readahead.i
-%config(noreplace) %verify(not md5 mtime size) /etc/pcmcia/network
 
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/daemon
+%dir %{_sysconfdir}/debug
 %dir %{_sysconfdir}/net
 %dir %{_sysconfdir}/system
 %dir %{_sysconfdir}/conf
 %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}/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}/system.runlevel
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default.runlevel
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.runlevel
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/test.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml
+
+%attr(755,root,root) /%{_lib}/libinitng.so.*.*.*
 
-%attr(755,root,root) /%{_lib}/libinitng.so
-%attr(755,root,root) /%{_lib}/libinitng.so.0
-%attr(755,root,root) /%{_lib}/libinitng.so.0.0
 %dir %{_libdir}
-%attr(755,root,root) %{_libdir}/libbashlaunch.so.*.*
-%attr(755,root,root) %{_libdir}/libcpout.so.*.*
-%attr(755,root,root) %{_libdir}/libezxmlparser.so.*.*
-%attr(755,root,root) %{_libdir}/libinitctl.so.*.*
-%attr(755,root,root) %{_libdir}/libiparser.so.*.*
-%attr(755,root,root) %{_libdir}/libngc.so.*.*
-%attr(755,root,root) %{_libdir}/libngc2.so.*.*
-%attr(755,root,root) %{_libdir}/librlparser.so.*.*
-%attr(755,root,root) %{_libdir}/libslaunch.so.*.*
-%attr(755,root,root) %{_libdir}/libstdout.so.*.*
-%attr(755,root,root) %{_libdir}/libup.so.*.*
-%attr(755,root,root) %{_libdir}/libxmlconfig.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %dir %{_libdir}/scripts
 %dir %{_libdir}/scripts/net
@@ -132,12 +141,9 @@
 %{_libdir}/scripts/net/system
 %{_libdir}/scripts/net/udhcpc-wrapper
 %{_libdir}/scripts/net/wpa_supplicant
-%dir %{_libdir}/scripts/system
-%{_libdir}/scripts/system/umount
-
-%{_prefix}%{_sbindir}/ifplugd.action
-%{_prefix}%{_sbindir}/wpa_cli.action
 
+%attr(755,root,root) %{_sbindir}/gen_system_runlevel.sh
+%attr(755,root,root) %{_sbindir}/install_service
 %attr(755,root,root) %{_sbindir}/initng
 %attr(755,root,root) %{_sbindir}/ng-update
 %attr(755,root,root) %{_sbindir}/ngc
@@ -146,6 +152,14 @@
 
 %{_mandir}/man8/initng.8*
 %{_mandir}/man8/ngc.8*
+%{_mandir}/man8/ng-update.8*
+
+%files fixes
+%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) /usr/sbin/ifplugd.action
+%attr(755,root,root) /usr/sbin/wpa_cli.action
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -153,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/07/28 21:41:42  glen
+- updated to 0.1.5
+
 Revision 1.12  2005/07/05 16:37:18  darekr
 - BR: sed 4.0
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to