[svn] r6154 - in trunk/rpms: . cacti dkms-r8168 nagios-nsca openal
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Feb 12 14:44:03 CET 2008
Author: dag
Date: 2008-02-12 14:44:01 +0100 (Tue, 12 Feb 2008)
New Revision: 6154
Added:
trunk/rpms/dkms-r8168/
trunk/rpms/dkms-r8168/dkms-r8168.spec
Modified:
trunk/rpms/cacti/cacti.spec
trunk/rpms/nagios-nsca/nagios-nsca.spec
trunk/rpms/openal/openal.spec
Log:
Updates
Modified: trunk/rpms/cacti/cacti.spec
===================================================================
--- trunk/rpms/cacti/cacti.spec 2008-02-12 11:49:06 UTC (rev 6153)
+++ trunk/rpms/cacti/cacti.spec 2008-02-12 13:44:01 UTC (rev 6154)
@@ -11,7 +11,7 @@
Summary: Complete network graphing solution designed on top of RRDTool
Name: cacti
-Version: 0.8.7a
+Version: 0.8.7b
Release: 1
License: GPL
Group: Applications/System
@@ -63,15 +63,15 @@
%{__cat} <<EOF >cacti.httpd
Alias /cacti/ %{_localstatedir}/www/cacti/
<Directory %{_localstatedir}/www/cacti/>
- DirectoryIndex index.php
- Options -Indexes
- AllowOverride all
- order deny,allow
- deny from all
- allow from 127.0.0.1
- AddType application/x-httpd-php .php
- php_flag magic_quotes_gpc on
- php_flag track_vars on
+ DirectoryIndex index.php
+ Options -Indexes
+ AllowOverride all
+ order deny,allow
+ deny from all
+ allow from 127.0.0.1
+ AddType application/x-httpd-php .php
+ php_flag magic_quotes_gpc on
+ php_flag track_vars on
</Directory>
EOF
@@ -88,13 +88,13 @@
%pre
if ! /usr/bin/id cacti &>/dev/null; then
- /usr/sbin/useradd -r -d %{_localstatedir}/www/cacti -s /bin/sh -c "cacti" cacti || \
- %logmsg "Unexpected error adding user \"cacti\". Aborting installation."
+ /usr/sbin/useradd -r -d %{_localstatedir}/www/cacti -s /bin/sh -c "cacti" cacti || \
+ %logmsg "Unexpected error adding user \"cacti\". Aborting installation."
fi
%postun
if [ $1 -eq 0 ]; then
- /usr/sbin/userdel cacti || %logmsg "User \"cacti\" could not be deleted."
+ /usr/sbin/userdel cacti || %logmsg "User \"cacti\" could not be deleted."
fi
%clean
@@ -126,6 +126,9 @@
%doc docs/*
%changelog
+* Tue Feb 12 2008 Dag Wieers <dag at wieers.com> - 0.8.7b-1
+- Updated to release 0.8.7b.
+
* Wed Nov 28 2007 Dag Wieers <dag at wieers.com> - 0.8.7a-1
- Updated to release 0.8.7a.
Added: trunk/rpms/dkms-r8168/dkms-r8168.spec
===================================================================
--- trunk/rpms/dkms-r8168/dkms-r8168.spec (rev 0)
+++ trunk/rpms/dkms-r8168/dkms-r8168.spec 2008-02-12 13:44:01 UTC (rev 6154)
@@ -0,0 +1,80 @@
+# $Id$
+# Authority: dag
+
+# Dist: nodist
+
+%define real_name r8168
+
+Summary: Driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
+Name: dkms-r8168
+Version: 8.004.00
+Release: 1
+License: GPL+
+Group: System Environment/Kernel
+URL: http://www.realtek.com.tw/
+
+Source: ftp://202.65.194.212/cn/nic/r8168-%{version}.tar.bz2
+Patch1: r8168-8.004.00-modversions.patch
+Patch2: r8168-8.004.00-makefile.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+Requires: gcc, make
+Requires(post): dkms
+Requires(preun): dkms
+
+%description
+Driver (Linux kernel module) for RTL8111/8168B PCI Express Gigabit Ethernet
+controllers.
+
+%prep
+%setup -n %{real_name}-%{version}
+%patch1 -p1 -b .modversions
+%patch2 -p1 -b .makefile
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+
+%define dkms_name r8168
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a src/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+# Configuration for dkms
+%{__cat} <<'EOF' >%{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+MAKE[0]="make KVER=${kernelver}"
+CLEAN[0]="make clean"
+BUILT_MODULE_NAME[0]=%{dkms_name}
+DEST_MODULE_LOCATION[0]=/kernel/drivers/net
+AUTOINSTALL="YES"
+EOF
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+%files
+%defattr(-, root, root, 0755)
+%doc readme release_note.txt
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+%changelog
+* Mon Feb 06 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 8.004.00-1
+- Initial rpm version. Shamelessly copy from dkms-r1000 by Matthias Saou
Property changes on: trunk/rpms/dkms-r8168/dkms-r8168.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/nagios-nsca/nagios-nsca.spec
===================================================================
--- trunk/rpms/nagios-nsca/nagios-nsca.spec 2008-02-12 11:49:06 UTC (rev 6153)
+++ trunk/rpms/nagios-nsca/nagios-nsca.spec 2008-02-12 13:44:01 UTC (rev 6154)
@@ -10,7 +10,7 @@
Summary: Nagios Service Check Acceptor
Name: nagios-nsca
Version: 2.6
-Release: 1
+Release: 2
License: GPL
Group: Applications/Internet
URL: http://www.nagios.org/
@@ -31,9 +31,9 @@
%setup -n %{real_name}-%{version}
#%{__perl} -pi.orig -e '
-# s|^(command_file)=\@localstatedir\@/rw/nagios.cmd|$1=%{_localstatedir}/spool/nagios/nagios.cmd|;
-# s|^(alternate_dump_file)=\@localstatedir\@/rw/nsca.dump|$1=%{_localstatedir}/spool/nagios/nsca.dump|;
-# ' nsca.cfg.in
+# s|^(command_file)=\@localstatedir\@/rw/nagios.cmd|$1=%{_localstatedir}/spool/nagios/nagios.cmd|;
+# s|^(alternate_dump_file)=\@localstatedir\@/rw/nsca.dump|$1=%{_localstatedir}/spool/nagios/nsca.dump|;
+# ' nsca.cfg.in
%{__cat} <<EOF >nsca.xinetd.dag
# default: off
@@ -41,8 +41,8 @@
service nsca
{
flags = REUSE
- type = UNLISTED
- port = 5667
+ type = UNLISTED
+ port = 5667
socket_type = stream
wait = no
user = nagios
@@ -82,60 +82,60 @@
desc="Nagios NSCA daemon"
start() {
- echo -n $"Starting $desc ($prog): "
- daemon $prog -c "$CONFIG" -d
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Starting $desc ($prog): "
+ daemon $prog -c "$CONFIG" -d
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
stop() {
- echo -n $"Shutting down $desc ($prog): "
- killproc $prog
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Shutting down $desc ($prog): "
+ killproc $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
restart() {
- stop
- start
+ stop
+ start
}
reload() {
- echo -n $"Reloading $desc ($prog): "
- killproc $prog -HUP
- RETVAL=$?
- echo
- return $RETVAL
+ echo -n $"Reloading $desc ($prog): "
+ killproc $prog -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
}
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart)
- restart
- ;;
+ restart
+ ;;
reload)
- reload
- ;;
+ reload
+ ;;
condrestart)
- [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
- RETVAL=$?
- ;;
+ [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
+ RETVAL=$?
+ ;;
status)
- status $prog
- RETVAL=$?
- ;;
+ status $prog
+ RETVAL=$?
+ ;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
@@ -143,11 +143,11 @@
%build
%configure \
- --sysconfdir="%{_sysconfdir}/nagios" \
- --localstatedir="%{_localstatedir}/log/nagios" \
- --with-nsca-user="nagios" \
- --with-nsca-grp="nagios" \
- --with-nsca-port="5667"
+ --sysconfdir="%{_sysconfdir}/nagios" \
+ --localstatedir="%{_localstatedir}/log/nagios" \
+ --with-nsca-user="nagios" \
+ --with-nsca-grp="nagios" \
+ --with-nsca-port="5667"
%{__make} %{?_smp_mflags} all
@@ -186,11 +186,16 @@
%config(noreplace) %{_sysconfdir}/xinetd.d/nsca
%config %{_initrddir}/nsca
#%dir %{_localstatedir}/spool/nagios/
-%dir %{_localstatedir}/log/nagios/rw/
%{_sbindir}/nsca
%{_sbindir}/send_nsca
+%defattr(-, nagios, apache, 2755)
+%dir %{_localstatedir}/log/nagios/rw/
+
%changelog
+* Mon Jan 28 2008 Dag Wieers <dag at wieers.com> - 2.6-2
+- Fixed ownership of %%{_localstatedir}/log/nagios/rw/. (Josh Kelley)
+
* Mon Dec 11 2006 Dag Wieers <dag at wieers.com> - 2.6-1
- Updated to release 2.6.
Modified: trunk/rpms/openal/openal.spec
===================================================================
--- trunk/rpms/openal/openal.spec 2008-02-12 11:49:06 UTC (rev 6153)
+++ trunk/rpms/openal/openal.spec 2008-02-12 13:44:01 UTC (rev 6154)
@@ -59,13 +59,13 @@
%build
%configure \
- --disable-smpeg \
+ --disable-smpeg \
%{!?_without_alsa:--enable-alsa} \
%{!?_without_arts:--enable-arts} \
- --enable-capture \
- --enable-esd \
- --enable-sdl \
- --enable-vorbis
+ --enable-capture \
+ --enable-esd \
+ --enable-sdl \
+ --enable-vorbis
%{__make} %{?_smp_mflags}
%install
More information about the svn-commits
mailing list