rpms/initng/FC-5 initng.spec,1.4,1.5

Sat Sep 30 04:36:38 UTC 2006

Author: danielm

Update of /cvs/extras/rpms/initng/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3340

Modified Files:
	initng.spec 
Log Message:
initng 0.6.8-3 spec file for fc5



Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/FC-5/initng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- initng.spec	4 Dec 2005 12:12:07 -0000	1.4
+++ initng.spec	30 Sep 2006 04:36:37 -0000	1.5
@@ -1,14 +1,19 @@
 Summary: Programs which control basic system processes
 Name: initng
-Version: 0.4.7
-Release: 4%{?dist}
+Version: 0.6.8
+Release: 3%{?dist}
 License: GPL
-URL: http://initng.thinktux.net
+URL: http://www.initng.org
 Group: System Environment/Base
-Source0: http://initng.thinktux.net/download/v0.4/initng-%{version}.tar.gz
+Source0: http://download.initng.org/%{name}/v0.6/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: filesystem >= 2.2.4-1
-BuildRequires: device-mapper >= 1.01
+Requires: filesystem
+Requires: initng(ifiles) >= 0.0.6
+BuildRequires: libselinux-devel libsepol-devel cmake
+Requires(post): procps
+Requires(triggerin): grep coreutils
+Requires: %{name}-lib = %{version}-%{release}
+Patch0: check-selinux.patch
 
 %description
 Initng is a full replacement of the old and in many ways deprecated sysvinit
@@ -16,41 +21,46 @@
 asynchronously. In other words: It will boot your unix-system much faster,
 and give you more control and statistics over your system.
 
-%package ifplugd
-Summary:  Ifplugd support for initng
-Group:    System Environment/Base
-Requires: %{name} = %{version}
-Requires: ifplugd
-
-%description ifplugd
-This package contains the files needed to add ifplugd support to initng.
-When an interface is plugged or unplugged, the networking will be restarted
-appropriately.
+%package lib
+Summary: Library files for initng
+Group: System Environment/Base
+
+%description lib
+Library files for initng
+
+%package devel
+Summary: Development files for initng
+Group: System Environment/Base
+Requires: %{name}-lib = %{version}-%{release}
+
+%description devel
+Files needed for doing initng development
 
 %prep
 %setup -q
+%patch0 -p0 -b .check_selinux
 
 %build
-%configure --libdir=/%{_lib} --sbindir=/sbin --disable-rpath
-make
+cmake . -DBUILD_SELINUX:BOOL=ON -DCOUNT_ME:BOOL=OFF -DLIB_INSTALL_DIR:STRING=/%{_lib}
+make %{?_smp_mflags} VERBOSE=1
 
 %install
-rm -rf %{buildroot}
+rm -rf %{buildroot} _doc
 make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent
-rm -rf %{buildroot}/sbin/killall5
-rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network
-rm -rf %{buildroot}/%{_sysconfdir}/initng/system.runlevel
-rm -rf %{buildroot}/%{_sysconfdir}/initng/default.runlevel
-mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
-mv %{buildroot}%{_datadir}/doc/initng/* %{buildroot}/%{_docdir}/%{name}-%{version}/
-cp -a COPYING AUTHORS CODING_STANDARDS FAQ NEWS README TODO \
-      %{buildroot}/%{_docdir}/%{name}-%{version}/
-mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin/
+rm -f %{buildroot}/sbin/killall5
+mkdir _doc
+mv %{buildroot}%{_datadir}/doc/%{name}/* _doc/
+chmod +x %{buildroot}/%_lib/initng/*.so %{buildroot}/%_lib/libinitng.so.* %{buildroot}/%_lib/libngcclient.so.* %{buildroot}/%_lib/libngeclient.so.*
 
 %post
+init=$(ps --no-headers -o '%%c' 1)
+test x"$init" != xinitng || /sbin/ngc --quiet -c || :
+
+%post lib -p /sbin/ldconfig
+
+%triggerin -- mkinitrd
 if [ $1 = 1 -a -f /boot/grub/grub.conf -a -x /sbin/grubby ]; then
-  grep initng /boot/grub/grub.conf >/dev/null
+  grep -q initng /boot/grub/grub.conf
   if [ $? -ne 0 ]; then
     cp /boot/grub/grub.conf /boot/grub/grub.conf.bak
     defaultkpath=`grubby --default-kernel`
@@ -62,48 +72,173 @@
     grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd
   fi
 fi
-if [ ! -f /%{_sysconfdir}/initng/system.runlevel ] && [ ! -f /%{_sysconfdir}/initng/default.runlevel ]; then
-  /sbin/gen_system_runlevel >/dev/null 2>&1 || :
-fi
-/sbin/ldconfig
-exit 0
 
 %clean
 rm -rf %{buildroot}
 
-%postun -p /sbin/ldconfig
+%postun lib -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}-%{version}
-%config(noreplace) %{_sysconfdir}/initng
-/sbin/system_off
-/sbin/ng-update
-/sbin/killalli5
+%doc COPYING AUTHORS NEWS README TODO
+%doc _doc/*
 /sbin/initng
 /sbin/ngc
 /sbin/ngdc
-/sbin/install_service
-/sbin/gen_system_runlevel
-/sbin/shutdown_script
-/sbin/ngcupdown
-/sbin/wpa_cli.action
+/sbin/nghalt
+/sbin/ngreboot
+/sbin/ngrestart
+/sbin/ngstart
+/sbin/ngstatus
+/sbin/ngstop
+/sbin/ngzap
+/sbin/nge
+/sbin/nge_raw
 /sbin/initng-segfault
-/%{_lib}/libinitng.*
-/%{_lib}/initng
+/sbin/killalli5
 %{_mandir}/*/*
+/%{_lib}/initng
+%config(noreplace) %{_sysconfdir}/initng/killall5-ignore
+
+%files lib
+%defattr(-,root,root)
+/%{_lib}/libinitng.so.*
+/%{_lib}/libngeclient.so.*
+/%{_lib}/libngcclient.so.*
 
-%files ifplugd
+%files devel
 %defattr(-,root,root)
-%{_sysconfdir}/ifplugd/action.d/ngcupdown
-/sbin/ifplugd.action
+%{_includedir}/initng
+/%{_lib}/libinitng.so
+/%{_lib}/libngeclient.so
+/%{_lib}/libngcclient.so
 
 %changelog
-* Sun Dec 04 2005 Daniel Malmgren <daner964 at student.liu.se> 0.4.7-4
-- Add build requirement on device-mapper, see if this helps building on x86_64...
+* Sat Sep 23 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.8-3
+- Fix up permissions of .so files
+- Remove the rpath stuff that works out-of-the-box with recent cmake
+- Include Enrico's patch to check if there is any selinux
+
+* Fri Sep 22 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.8-2
+- Removed policycoreutils dependency
+
+* Tue Sep 19 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.8-1
+- New upstream version
+
+* Wed May 24 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.7-4
+- Corrected cmake arguments
+- Added verbosity to compilation
+
+* Wed May 24 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.7-3
+- Run ldconfig on post and postun of lib package instead of main
+- Move plugins back from lib to main package
+
+* Sat May 20 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.7-2
+- Send cmake the default opt flags
+- Move .so files to devel package
+- Fix up initng hot reload stuff in post
+- Move library stuff to lib subpackage
+
+* Fri May 19 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.7-1
+- New upstream version
+- Added --quiet argument to ngc
+- Enabled selinux, which is now supposed to work!
+- Added /etc/initng/killall5-ignore and /lib/libsngeclient.a to install
+
+* Fri May 12 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.6-1
+- New upstream version
+- Once again commented out the selinux stuff since I can't get it to work.
+
+* Wed May 10 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.5-1
+- New upstream version
+- Removed the hardcoded /lib path
+
+* Mon May 08 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.4-1
+- New upstream version
+- Added lib config flag to cmake
+- Removed CODING_STANDARDS and FAQ that doesn't exist anymore
+
+* Thu Apr 27 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.3-4
+- Really generate runlevel files
 
-* Sun Dec 04 2005 Daniel Malmgren <daner964 at student.liu.se> 0.4.7-3
-- First version released to Fedora extras
+* Wed Apr 26 2006 Adel Gadllah <adel.gadllah at gmx.net> 0.6.3-3
+- Fix /lib x86_64 issue (its hardcoded upstream)
+- Fix rpath issue
+
+* Wed Apr 26 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.3-2
+- Only hot reload initng if there is a initng process
+- Add cmake back to buildrequires
+
+* Wed Apr 26 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.3-1
+- New upstream version
+- Removed selinux version check from spec, this is now upstreams
+- Hot reload initng in %post
+
+* Wed Apr 26 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.2-1
+- New upstream version
+- More cleanups (BZ #173459c239)
+
+* Mon Apr 24 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.1-1
+- New upstream version
+- Adopt for cmake
+- Some more cleanups
+
+* Fri Apr 14 2006 Adel Gadllah <adel.gadllah at gmx.net> 0.6.0-2
+- Add Selinux filecontext to %post and %postun
+- Some specfile cleanups (BZ #173459#c227)
+
+* Tue Mar 28 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.0-1
+- New upstream version
+
+* Mon Mar 27 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.0-0.1.RC2
+- New upstream release candidate
+- Fix version/release
+
+* Fri Mar 24 2006 Daniel Malmgren <daner964 at student.liu.se> 0.6.0RC1-1
+- New upstream release candidate
+- Split out initng-ifiles to separate spec file
+- Added new devel rpm
+- Added libngeclient and also nge tools to sbin
+
+* Thu Mar 09 2006 Daniel Malmgren <daner964 at student.liu.se> 0.5.5-1
+- New upstream version
+- Added /sbin/test_pidfile
+
+* Mon Feb 27 2006 Daniel Malmgren <daner964 at student.liu.ser> 0.5.4-2
+- Added --disable-count-me configure argument
+
+* Mon Feb 27 2006 Daniel Malmgren <daner964 at student.liu.ser> 0.5.4-1
+- New upstream version
+- Remove selinux patch since it's now in upstreams. Don't enable selinux though
+  since it stops initng from compiling cleanly.
+- Add whole bunch of new stuff to /sbin
+
+* Mon Jan 23 2006 Daniel Malmgren <daner964 at student.liu.ser> 0.5.3-1
+- New upstream version
+
+* Tue Jan 17 2006 Daniel Malmgren <daner964 at student.liu.ser> 0.5.2-2
+- Run gen_system_runlevel even if the runlevels exist. The script is
+  smart enough to handle this itself.
+
+* Sat Jan 14 2006 Daniel Malmgren <daner964 at student.liu.ser> 0.5.2-1
+- New upstream version
+
+* Sun Jan 08 2006 Daniel Malmgren <daner964 at student.liu.se> 0.5.1-1
+- New upstream version
+- Include dragoran's selinux patch
+
+* Tue Dec 27 2005 Daniel Malmgren <daner964 at student.liu.se> 0.5.0-2
+- Fix source URL from 0.4 to 0.5
+
+* Tue Dec 27 2005 Daniel Malmgren <daner964 at student.liu.se> 0.5.0-1
+- New upstream version
+
+* Thu Dec 15 2005 Daniel Malmgren <daner964 at student.liu.se> 0.4.8-2
+- Pass '--localstatedir=/var' to configure according to directions in
+  initng bugzilla 319
+
+* Thu Dec 15 2005 Daniel Malmgren <daner964 at student.liu.se> 0.4.8-1
+- New upstream version
 
 * Sun Dec 04 2005 Adel Gadllah <adel.gadllah at gmx.net> 0.4.7-2
 - Fixed case where default entry in grub is not a linuxkernel


