[svn] r6211 - in trunk/rpms: . amavisd-new freedup fuse-ntfs-3g
gnash gnome-common lftp liboil lua mpg123 nagios pv
python-krbv slsnif tightvnc
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Mar 14 02:18:59 CET 2008
Author: dag
Date: 2008-03-14 01:18:51 +0000 (Fri, 14 Mar 2008)
New Revision: 6211
Added:
trunk/rpms/gnome-common/gnome-common-1.2.spec
trunk/rpms/gnome-common/gnome-common-2.8.spec
trunk/rpms/slsnif/
trunk/rpms/slsnif/slsnif.spec
Modified:
trunk/rpms/amavisd-new/amavisd-new.spec
trunk/rpms/freedup/freedup.spec
trunk/rpms/fuse-ntfs-3g/fuse-ntfs-3g.spec
trunk/rpms/gnash/gnash.spec
trunk/rpms/gnome-common/gnome-common.spec
trunk/rpms/lftp/lftp.spec
trunk/rpms/liboil/liboil.spec
trunk/rpms/lua/lua.spec
trunk/rpms/mpg123/mpg123.spec
trunk/rpms/nagios/nagios.spec
trunk/rpms/pv/pv.spec
trunk/rpms/python-krbv/python-krbv.spec
trunk/rpms/tightvnc/tightvnc.spec
Log:
Updates
Modified: trunk/rpms/amavisd-new/amavisd-new.spec
===================================================================
--- trunk/rpms/amavisd-new/amavisd-new.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/amavisd-new/amavisd-new.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -11,8 +11,8 @@
Summary: Mail virus-scanner
Name: amavisd-new
-Version: 2.5.3
-Release: 2
+Version: 2.5.4
+Release: 1
License: GPL
Group: System Environment/Daemons
URL: http://www.ijs.si/software/amavisd/
@@ -335,6 +335,9 @@
%{_sbindir}/amavis-milter
%changelog
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 2.5.4-1
+- Updated to release 2.5.4.
+
* Mon Jan 28 2008 Dag Wieers <dag at wieers.com> - 2.5.3-2
- Added missing amavisd helper-utils. (Ralph Angenendt)
Modified: trunk/rpms/freedup/freedup.spec
===================================================================
--- trunk/rpms/freedup/freedup.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/freedup/freedup.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -3,8 +3,8 @@
Summary: Reclaim space on your drive
Name: freedup
-%define real_version 1.5-2
-Version: 1.5.2
+%define real_version 1.5-3
+Version: 1.5.3
Release: 1
License: GPL
Group: Applications/File
@@ -44,8 +44,11 @@
%{_bindir}/freedup
%changelog
+* Fri Mar 07 2008 Dag Wieers <dag at wieers.com> - 1.5.3-1
+- Updated to release 1.5-3.
+
* Mon Mar 03 2008 Dag Wieers <dag at wieers.com> - 1.5.2-1
-- Updated to release 1.5-1.
+- Updated to release 1.5-2.
* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 1.5.1-1
- Updated to release 1.5-1.
Modified: trunk/rpms/fuse-ntfs-3g/fuse-ntfs-3g.spec
===================================================================
--- trunk/rpms/fuse-ntfs-3g/fuse-ntfs-3g.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/fuse-ntfs-3g/fuse-ntfs-3g.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -7,7 +7,7 @@
Summary: Linux NTFS userspace driver
Name: fuse-ntfs-3g
-Version: 1.2216
+Version: 1.2310
Release: 1
License: GPL
Group: System Environment/Kernel
@@ -74,7 +74,7 @@
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog COPYING* CREDITS NEWS README
%doc %{_mandir}/man8/mount.ntfs-3g.8*
%doc %{_mandir}/man8/ntfs-3g.8*
%doc %{_mandir}/man8/ntfs-3g.probe.8*
@@ -94,6 +94,9 @@
%exclude %{_libdir}/libntfs-3g.la
%changelog
+* Wed Mar 12 2008 Dag Wieers <dag at wieers.com> - 1.2310-1
+- Updated to release 1.2310.
+
* Sun Feb 17 2008 Dag Wieers <dag at wieers.com> - 1.2216-1
- Updated to release 1.2216.
Modified: trunk/rpms/gnash/gnash.spec
===================================================================
--- trunk/rpms/gnash/gnash.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/gnash/gnash.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -19,7 +19,7 @@
Summary: Flash player
Name: gnash
-Version: 0.8.1
+Version: 0.8.2
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -28,9 +28,21 @@
Source: http://ftp.gnu.org/gnu/gnash/%{version}/gnash-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: SDL-devel, libxml2-devel, SDL_mixer-devel, boost-devel
-BuildRequires: libpng-devel, libmad-devel, libogg-devel, gcc-c++
-BuildRequires: atk-devel, autotrace, agg-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: agg-devel
+BuildRequires: atk-devel
+BuildRequires: autotrace
+BuildRequires: boost-devel
+BuildRequires: curl-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: gcc-c++
+BuildRequires: gstreamer >= 0.10
+BuildRequires: libjpeg-devel
+BuildRequires: libmad-devel
+BuildRequires: libogg-devel
+BuildRequires: libpng-devel
+BuildRequires: libxml2-devel
%{!?_without_kde32:BuildRequires: kdebase-devel >= 3.2}
%{?_with_modxorg:BuildRequires: libGLU-devel, libXmu-devel, libXi-devel}
%{!?_with_modxorg:BuildRequires: XFree86-devel}
@@ -64,25 +76,29 @@
#./autogen.sh
source %{_sysconfdir}/profile.d/qt.sh
%configure \
- --disable-ghelp \
- --disable-docbook \
- --disable-rpath \
- --disable-static \
- --enable-dom \
- --enable-glext \
- --enable-http \
- --enable-jpeg \
+ --disable-dependency-tracking \
+ --disable-ghelp \
+ --disable-docbook \
+ --disable-rpath \
+ --disable-static \
+ --enable-dom \
+ --enable-extensions \
+ --enable-glext \
+ --enable-gstreamer \
+ --enable-gui="gtk" \
+ --enable-http \
+ --enable-jpeg \
%{!?_without_kde32:--enable-klash} \
%{?_without_kde32:--disable-klash} \
- --enable-mp3 \
- --enable-net-conn \
- --enable-ogg \
- --enable-plugin \
- --enable-pthreads \
- --enable-png \
- --enable-xmlreader \
- --with-plugindir="%{_libdir}/mozilla/plugins"
-# --with-qtdir="$QTDIR"
+ --enable-mp3 \
+ --enable-net-conn \
+ --enable-ogg \
+ --enable-plugin \
+ --enable-pthreads \
+ --enable-png \
+ --enable-xmlreader \
+ --with-plugindir="%{_libdir}/mozilla/plugins"
+# --with-qtdir="$QTDIR"
%{__make} %{?_smp_mflags}
%install
@@ -92,28 +108,39 @@
%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
+### Clean up buildroot
+%{__mv} -v %{buildroot}%{_docdir}/gnash/ rpm-docs/
+
%clean
%{__rm} -rf %{buildroot}
%files -f %{name}.lang
%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS TODO
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS TODO rpm-docs/*
+%doc %{_mandir}/man1/cygnal.1*
+%doc %{_mandir}/man1/dumpshm.1*
%doc %{_mandir}/man1/gnash.1*
+%doc %{_mandir}/man1/gprocessor.1*
+%doc %{_mandir}/man1/soldumper.1*
+%{_bindir}/dumpshm
%{_bindir}/gnash
%{_bindir}/gtk-gnash
%{_bindir}/kde-gnash
-%{_bindir}/gparser
+#%{_bindir}/gparser
%{_bindir}/gprocessor
+%{_bindir}/soldumper
%{_datadir}/gnash/
%{_libdir}/gnash/libgnashamf*.so*
-%{_libdir}/gnash/libgnashbackend*.so*
+#%{_libdir}/gnash/libgnashbackend*.so*
%{_libdir}/gnash/libgnashbase*.so*
-%{_libdir}/gnash/libgnashgeo*.so*
+#%{_libdir}/gnash/libgnashgeo*.so*
+%{_libdir}/gnash/libgnashmedia*.so*
%{_libdir}/gnash/libgnashserver*.so*
%exclude %{_libdir}/gnash/libgnashamf.la
-%exclude %{_libdir}/gnash/libgnashbackend.la
+#%exclude %{_libdir}/gnash/libgnashbackend.la
%exclude %{_libdir}/gnash/libgnashbase.la
-%exclude %{_libdir}/gnash/libgnashgeo.la
+#%exclude %{_libdir}/gnash/libgnashgeo.la
+%exclude %{_libdir}/gnash/libgnashmedia.la
%exclude %{_libdir}/gnash/libgnashserver.la
%if %{!?_without_kde32:1}0
@@ -123,8 +150,8 @@
#%{_bindir}/klash
%{_datadir}/apps/klash
%{_datadir}/services/klash_part.desktop
-%{_libdir}/kde3/libklashpart.la
-%{_libdir}/kde3/libklashpart.so
+#%{_libdir}/kde3/libklashpart.la
+#%{_libdir}/kde3/libklashpart.so
%endif
%files -n mozilla-gnash
@@ -134,6 +161,9 @@
%{_libdir}/mozilla/plugins/
%changelog
+* Fri Mar 07 2008 Dag Wieers <dag at wieers.com> - 0.8.2-1
+- Updated to release 0.8.2.
+
* Mon Sep 24 2007 Dag Wieers <dag at wieers.com> - 0.8.1-1
- Updated to release 0.8.1.
Added: trunk/rpms/gnome-common/gnome-common-1.2.spec
===================================================================
--- trunk/rpms/gnome-common/gnome-common-1.2.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/gnome-common/gnome-common-1.2.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -0,0 +1,52 @@
+# $Id: gnome-common.spec 4303 2006-04-18 22:05:03Z dries $
+# Authority: dag
+
+# ExclusiveDist: el2 rh7 rh9 el3
+
+Summary: Useful things common to building gnome packages
+Name: gnome-common
+Version: 1.2.4
+Release: 1
+License: GPL
+Group: Development/Tools
+URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/1.2/gnome-common-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: pkgconfig
+
+%description
+This package contains sample files that should be used to develop pretty much
+every GNOME application.
+
+%prep
+%setup
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root, 0755)
+%{_bindir}/gnome-autogen.sh
+%dir %{_datadir}/aclocal/
+%{_datadir}/aclocal/gnome-macros/
+%{_datadir}/aclocal/gnome2-macros/
+
+%changelog
+* Tue Feb 25 2003 Dag Wieers <dag at wieers.com> - 1.2.4-1
+- Improved SPEC file.
+
+* Tue Feb 25 2003 Dag Wieers <dag at wieers.com> - 1.2.4-0
+- Initial package. (using DAR)
Added: trunk/rpms/gnome-common/gnome-common-2.8.spec
===================================================================
--- trunk/rpms/gnome-common/gnome-common-2.8.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/gnome-common/gnome-common-2.8.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -0,0 +1,55 @@
+# $Id: gnome-common.spec 4303 2006-04-18 22:05:03Z dries $
+# Authority: dag
+
+# ExclusiveDist: el4
+
+Summary: Useful things common to building gnome packages
+Name: gnome-common
+Version: 2.8.0
+Release: 1
+License: GPL
+Group: Development/Tools
+URL: http://developer.gnome.org/
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.8/gnome-common-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: pkgconfig
+
+%description
+This package contains sample files that should be used to develop pretty much
+every GNOME application.
+
+%prep
+%setup
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/*.txt
+%{_bindir}/gnome-autogen.sh
+%{_bindir}/gnome-doc-common
+%dir %{_datadir}/aclocal/
+%{_datadir}/aclocal/gnome-common.m4
+%{_datadir}/aclocal/gnome-compiler-flags.m4
+%{_datadir}/gnome-common/
+
+%changelog
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 2.8.0-1
+- Updated to release 2.8.0.
+
+* Tue Feb 25 2003 Dag Wieers <dag at wieers.com> - 1.2.4-0
+- Initial package. (using DAR)
Modified: trunk/rpms/gnome-common/gnome-common.spec
===================================================================
--- trunk/rpms/gnome-common/gnome-common.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/gnome-common/gnome-common.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -1,17 +1,19 @@
# $Id$
-
# Authority: dag
+# ExclusiveDist: el5
+
Summary: Useful things common to building gnome packages
Name: gnome-common
-Version: 1.2.4
-Release: 0.2
+Version: 2.12.0
+Release: 1
License: GPL
Group: Development/Tools
URL: http://developer.gnome.org/
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/1.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.12/gnome-common-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
BuildRequires: pkgconfig
%description
@@ -27,25 +29,27 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%clean
%{__rm} -rf %{buildroot}
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%files
%defattr(-, root, root, 0755)
-%{_bindir}/*
-%{_datadir}/aclocal/*
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/*.txt
+%{_bindir}/gnome-autogen.sh
+%{_bindir}/gnome-doc-common
+%dir %{_datadir}/aclocal/
+%{_datadir}/aclocal/gnome-common.m4
+%{_datadir}/aclocal/gnome-compiler-flags.m4
+%{_datadir}/gnome-common/
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.4-0.2
-- Rebuild for Fedora Core 5.
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 2.12.0-1
+- Updated to release 2.12.0.
* Tue Feb 25 2003 Dag Wieers <dag at wieers.com> - 1.2.4-0
- Initial package. (using DAR)
Modified: trunk/rpms/lftp/lftp.spec
===================================================================
--- trunk/rpms/lftp/lftp.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/lftp/lftp.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -7,7 +7,7 @@
Summary: Sophisticated file transfer program
Name: lftp
-Version: 3.6.3
+Version: 3.7.0
Release: 1
License: GPL
Group: Applications/Internet
@@ -62,6 +62,9 @@
%{_libdir}/liblftp-tasks.so*
%changelog
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 3.7.0-1
+- Updated to release 3.7.0.
+
* Mon Jan 28 2008 Dag Wieers <dag at wieers.com> - 3.6.3-1
- Updated to release 3.6.3.
Modified: trunk/rpms/liboil/liboil.spec
===================================================================
--- trunk/rpms/liboil/liboil.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/liboil/liboil.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -1,13 +1,13 @@
# $Id$
-# Authority: matthias
+# Authority: dag
-### EL ships with liboil 0.3.8-2.1
+### EL5 ships with liboil 0.3.8-2.1
# ExclusiveDist: el2 rh7 rh9 el3 el4
Summary: Library of Optimized Inner Loops, CPU optimized functions
Name: liboil
-Version: 0.3.12
-Release: 0
+Version: 0.3.13
+Release: 0.1
License: LGPL
Group: System Environment/Libraries
URL: http://liboil.freedesktop.org/
@@ -23,7 +23,6 @@
significant optimization using various techniques, especially by using
extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.).
-
%package devel
Summary: Development files and static library for liboil
Group: Development/Libraries
@@ -37,33 +36,26 @@
significant optimization using various techniques, especially by using
extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.).
-
%prep
%setup
-
%build
%configure
%{__make} %{?_smp_mflags}
-
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"
-
%clean
%{__rm} -rf %{buildroot}
-
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
-
%files
%defattr(-, root, root, 0755)
-%doc ChangeLog
+%doc AUTHORS BUG-REPORTING COPYING HACKING NEWS README
%{_bindir}/oil-bugreport
%{_libdir}/liboil-0.3.so.*
@@ -76,8 +68,10 @@
%{_libdir}/pkgconfig/liboil-0.3.pc
%doc %{_datadir}/gtk-doc/html/liboil/
-
%changelog
+* Fri Mar 07 2008 Dag Wieers <dag at wieers.com> - 0.3.13-1
+- Updated to release 0.3.13.
+
* Sat Jun 02 2007 Dag Wieers <dag at wieers.com> - 0.3.12-1
- Updated to release 0.3.12.
Modified: trunk/rpms/lua/lua.spec
===================================================================
--- trunk/rpms/lua/lua.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/lua/lua.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -3,7 +3,7 @@
Summary: Lua scripting language
Name: lua
-Version: 5.0.2
+Version: 5.1.3
Release: 1
License: MIT
Group: Development/Libraries
@@ -38,30 +38,27 @@
### FIXME: Make buildsystem use standard autotools directories (Fix upstream please)
%{__perl} -pi.orig -e '
- s|^(INSTALL_ROOT=).*$|$1 \$(prefix)|;
- s|^(INSTALL_BIN=).*$|$1 \$(bindir)|;
- s|^(INSTALL_INC=).*$|$1 \$(includedir)|;
- s|^(INSTALL_LIB=).*$|$1 \$(libdir)|;
- s|^(INSTALL_MAN=).*$|$1 \$(mandir)/man1|;
- s|^(INSTALL_EXEC=).*$|$1 %{__install} -p -m0755|;
- s|^(INSTALL_DATA=).*$|$1 %{__install} -p -m0644|;
- ' config
+ s|^(INSTALL_ROOT=).*$|$1 \$(prefix)|;
+ s|^(INSTALL_BIN=).*$|$1 \$(bindir)|;
+ s|^(INSTALL_INC=).*$|$1 \$(includedir)|;
+ s|^(INSTALL_LIB=).*$|$1 \$(libdir)|;
+ s|^(INSTALL_MAN=).*$|$1 \$(mandir)/man1|;
+ s|^(INSTALL_EXEC=).*$|$1 %{__install} -p -m0755|;
+ s|^(INSTALL_DATA=).*$|$1 %{__install} -p -m0644|;
+ ' config
%build
%{__make} %{?_smp_mflags} all so \
- MYCFLAGS="%{optflags} -fPIC"
+ MYCFLAGS="%{optflags} -fPIC"
%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__install} -p -m0755 lib/*.so* %{buildroot}%{_libdir}
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%clean
%{__rm} -rf %{buildroot}
@@ -79,6 +76,9 @@
%{_libdir}/*.so
%changelog
+* Sun Feb 10 2008 Dag Wieers <dag at wieers.com> - 5.1.3-1
+- Updated to release 5.1.3.
+
* Tue Mar 23 2004 Dag Wieers <dag at wieers.com> - 5.0.2-1
- Updated to release 5.0.2.
Modified: trunk/rpms/mpg123/mpg123.spec
===================================================================
--- trunk/rpms/mpg123/mpg123.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/mpg123/mpg123.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -45,7 +45,7 @@
Summary: MPEG audio player
Name: mpg123
-Version: 1.3.0
+Version: 1.3.1
Release: 1
License: GPL/LGPL
Group: Applications/Multimedia
@@ -116,6 +116,9 @@
%exclude %{_libdir}/libmpg123.la
%changelog
+* Sun Mar 09 2008 Dag Wieers <dag at wieers.com> - 1.3.1-1
+- Updated to release 1.3.1.
+
* Mon Mar 03 2008 Dag Wieers <dag at wieers.com> - 1.3.0-1
- Updated to release 1.3.0.
Modified: trunk/rpms/nagios/nagios.spec
===================================================================
--- trunk/rpms/nagios/nagios.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/nagios/nagios.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -5,8 +5,9 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{?rh7:%define _without_embedperl 1}
+%{?el2:%define _without_embedperl 1}
+
%{?rh7:%define _without_perlcache 1}
-%{?el2:%define _without_embedperl 1}
%{?el2:%define _without_perlcache 1}
### FIXME: TODO: Add sysv script based on template. (remove cmd-file on start-up)
@@ -14,13 +15,13 @@
Summary: Open Source host, service and network monitoring program
Name: nagios
-Version: 2.10
+Version: 2.11
Release: 1
License: GPL
Group: Applications/System
URL: http://www.nagios.org/
-Source: http://dl.sf.net/nagios/nagios-%{version}.tar.gz
+Source0: http://dl.sf.net/nagios/nagios-%{version}.tar.gz
Source1: http://dl.sf.net/nagios/imagepak-base.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -52,35 +53,37 @@
%prep
%setup
+%{__perl} -pi.orig -e 's|/usr/local/nagios/var/rw|%{_localstatedir}/nagios/rw|g;' eventhandlers/submit_check_result
+
%build
%configure \
- --datadir="%{_datadir}/nagios" \
- --libexecdir="%{_libdir}/nagios/plugins" \
- --localstatedir="%{_localstatedir}/log/nagios" \
- --sbindir="%{_libdir}/nagios/cgi" \
- --sysconfdir="%{_sysconfdir}/nagios" \
- --with-cgiurl="/nagios/cgi-bin" \
- --with-command-user="apache" \
- --with-command-group="apache" \
- --with-gd-lib="%{_libdir}" \
- --with-gd-inc="%{_includedir}" \
- --with-htmurl="/nagios" \
- --with-init-dir="%{_initrddir}" \
- --with-lockfile="%{_localstatedir}/run/nagios.pid" \
- --with-mail="/bin/mail" \
- --with-nagios-user="nagios" \
- --with-nagios-group="nagios" \
+ --datadir="%{_datadir}/nagios" \
+ --libexecdir="%{_libdir}/nagios/plugins" \
+ --localstatedir="%{_localstatedir}/log/nagios" \
+ --sbindir="%{_libdir}/nagios/cgi" \
+ --sysconfdir="%{_sysconfdir}/nagios" \
+ --with-cgiurl="/nagios/cgi-bin" \
+ --with-command-user="apache" \
+ --with-command-group="apache" \
+ --with-gd-lib="%{_libdir}" \
+ --with-gd-inc="%{_includedir}" \
+ --with-htmurl="/nagios" \
+ --with-init-dir="%{_initrddir}" \
+ --with-lockfile="%{_localstatedir}/run/nagios.pid" \
+ --with-mail="/bin/mail" \
+ --with-nagios-user="nagios" \
+ --with-nagios-group="nagios" \
%{!?_without_embedperl:--enable-embedded-perl} \
-%{?_without_embedperl:--disable-embedded-perl} \
-%{?_without_embedperl:--without-embedded-perl} \
%{!?_without_perlcache:--with-perlcache} \
-%{?_without_perlcache:--without-perlcache} \
-%{?_without_perlcache:--disable-perlcache} \
- --with-template-objects \
- --with-template-extinfo \
- --enable-event-broker
+ --with-template-objects \
+ --with-template-extinfo \
+ --enable-event-broker
%{__make} %{?_smp_mflags} all
+
+### Apparently contrib wants to do embedded-perl stuff as well and does not obey configure !
+%if %{!?_without_embedperl:1}0
%{__make} %{?_smp_mflags} -C contrib
+%endif
%install
%{__rm} -rf %{buildroot}
@@ -90,9 +93,12 @@
COMMAND_OPTS="" \
INIT_OPTS=""
+### Apparently contrib wants to do embedded-perl stuff as well and does not obey configure !
+%if %{!?_without_embedperl:1}0
%{__make} install -C contrib \
DESTDIR="%{buildroot}" \
INSTALL_OPTS=""
+%endif
%{__install} -d -m0755 %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/
%{__cp} -afpv contrib/eventhandlers/* %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/
@@ -107,42 +113,42 @@
%pre
if ! /usr/bin/id nagios &>/dev/null; then
- /usr/sbin/useradd -r -d %{_localstatedir}/log/nagios -s /bin/sh -c "nagios" nagios || \
- %logmsg "Unexpected error adding user \"nagios\". Aborting installation."
+ /usr/sbin/useradd -r -d %{_localstatedir}/log/nagios -s /bin/sh -c "nagios" nagios || \
+ %logmsg "Unexpected error adding user \"nagios\". Aborting installation."
fi
if ! /usr/bin/getent group nagiocmd &>/dev/null; then
- /usr/sbin/groupadd nagiocmd &>/dev/null || \
- %logmsg "Unexpected error adding group \"nagiocmd\". Aborting installation."
+ /usr/sbin/groupadd nagiocmd &>/dev/null || \
+ %logmsg "Unexpected error adding group \"nagiocmd\". Aborting installation."
fi
%post
/sbin/chkconfig --add nagios
if /usr/bin/id apache &>/dev/null; then
- if ! /usr/bin/id -Gn apache 2>/dev/null | grep -q nagios ; then
- /usr/sbin/usermod -G nagios,nagiocmd apache &>/dev/null
- fi
+ if ! /usr/bin/id -Gn apache 2>/dev/null | grep -q nagios ; then
+ /usr/sbin/usermod -G nagios,nagiocmd apache &>/dev/null
+ fi
else
- %logmsg "User \"apache\" does not exist and is not added to group \"nagios\". Sending commands to Nagios from the command CGI is not possible."
+ %logmsg "User \"apache\" does not exist and is not added to group \"nagios\". Sending commands to Nagios from the command CGI is not possible."
fi
if [ -f %{_sysconfdir}/httpd/conf/httpd.conf ]; then
- if ! grep -q "Include .*/nagios.conf" %{_sysconfdir}/httpd/conf/httpd.conf; then
- echo -e "\n# Include %{_sysconfdir}/httpd/conf.d/nagios.conf" >> %{_sysconfdir}/httpd/conf/httpd.conf
-# /sbin/service httpd restart
- fi
+ if ! grep -q "Include .*/nagios.conf" %{_sysconfdir}/httpd/conf/httpd.conf; then
+ echo -e "\n# Include %{_sysconfdir}/httpd/conf.d/nagios.conf" >> %{_sysconfdir}/httpd/conf/httpd.conf
+# /sbin/service httpd restart
+ fi
fi
%preun
if [ $1 -eq 0 ]; then
- /sbin/service nagios stop &>/dev/null || :
- /sbin/chkconfig --del nagios
+ /sbin/service nagios stop &>/dev/null || :
+ /sbin/chkconfig --del nagios
fi
%postun
if [ $1 -eq 0 ]; then
- /usr/sbin/userdel nagios || %logmsg "User \"nagios\" could not be deleted."
- /usr/sbin/groupdel nagios || %logmsg "Group \"nagios\" could not be deleted."
+ /usr/sbin/userdel nagios || %logmsg "User \"nagios\" could not be deleted."
+ /usr/sbin/groupdel nagios || %logmsg "Group \"nagios\" could not be deleted."
fi
/sbin/service nagios condrestart &>/dev/null || :
@@ -154,12 +160,12 @@
%doc Changelog INSTALLING LICENSE README UPGRADING
%config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf
%config %{_initrddir}/nagios
-%{_bindir}/convertcfg
+%{!?_without_embedperl:%{_bindir}/convertcfg}
%{_bindir}/nagios
%{_bindir}/nagiostats
%{!?_without_perlcache:%{_bindir}/p1.pl}
-%{_bindir}/mini_epn
-%{_bindir}/new_mini_epn
+%{!?_without_embedperl:%{_bindir}/mini_epn}
+%{!?_without_embedperl:%{_bindir}/new_mini_epn}
%{_libdir}/nagios/
%{_datadir}/nagios/
@@ -181,6 +187,10 @@
%{_includedir}/nagios/
%changelog
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 2.11-1
+- Updated to release 2.11.
+- Fixed a wrong reference to /usr/local. (Christophe Sahut)
+
* Wed Oct 24 2007 Christoph Maser <cmr at financial.com> - 2.10-1
- Updated to release 2.10.
Modified: trunk/rpms/pv/pv.spec
===================================================================
--- trunk/rpms/pv/pv.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/pv/pv.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -4,7 +4,7 @@
Summary: Monitor the progress of data through a pipe
Name: pv
-Version: 1.1.0
+Version: 1.1.4
Release: 1
License: Artistic
Group: Development/Tools
@@ -53,15 +53,15 @@
%{_bindir}/pv
%changelog
+* Fri Mar 07 2008 Dag Wieers <dag at wieers.com> - 1.1.4-1
+- Updated to release 1.1.4.
+
* Tue Jan 15 2008 Dries Verachtert <dries at ulyssis.org> - 1.1.0-1
- Updated to release 1.1.0.
* Tue Sep 26 2006 Dries Verachtert <dries at ulyssis.org> - 0.9.6-1
- Updated to release 0.9.6.
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.9.2-1.2
-- Rebuild for Fedora Core 5.
-
* Sat Sep 03 2005 Dag Wieers <dag at wieers.com> - 0.9.2-1
- Updated to release 0.9.2.
Modified: trunk/rpms/python-krbv/python-krbv.spec
===================================================================
--- trunk/rpms/python-krbv/python-krbv.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/python-krbv/python-krbv.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -14,7 +14,7 @@
URL: http://people.redhat.com/mikeb/python-krbV/
Source: http://people.redhat.com/mikeb/python-krbV/python-krbV-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.2
BuildRequires: krb5-devel >= 1.2.2
Added: trunk/rpms/slsnif/slsnif.spec
===================================================================
--- trunk/rpms/slsnif/slsnif.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/slsnif/slsnif.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -0,0 +1,41 @@
+# $Id$
+# Authority: dag
+
+Summary: Serial line Sniffer
+Name: slsnif
+Version: 0.4.4
+Release: 1
+License: GPL
+Group: Applications/Communications
+URL: http://slsnif.sourceforge.net/
+
+Source: http://dl.sf.net/sourceforge/slsnif/slsnif-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+slsnif is a serial port logging tool. slsnif listens to the specified serialx
+port and logs all data going through this port in both directions.
+
+%prep
+%setup
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO slsnifrc-example
+%doc %{_mandir}/man1/slsnif.1*
+%{_bindir}/slsnif
+
+%changelog
+* Wed Mar 12 2008 Dag Wieers <dag at wieers.com> - 0.4.4-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/slsnif/slsnif.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/tightvnc/tightvnc.spec
===================================================================
--- trunk/rpms/tightvnc/tightvnc.spec 2008-03-13 17:05:45 UTC (rev 6210)
+++ trunk/rpms/tightvnc/tightvnc.spec 2008-03-14 01:18:51 UTC (rev 6211)
@@ -25,7 +25,7 @@
Summary: Graphical remote administration system
Name: tightvnc
Version: 1.3.9
-Release: 1
+Release: 2
License: GPL
Group: User Interface/Desktops
URL: http://www.tightvnc.com/
@@ -73,6 +73,8 @@
%{__perl} -pi -e 's|/usr/local/vnc/classes|%{_datadir}/vnc/classes|;' vncserver
%{__perl} -pi -e 's|unix/:7100|unix/:-1|;' vncserver
+%{!?_without_modxorg:%{__perl} -pi -e 's|^# (\$colorPath) = .+$|$1 = "/usr/share/X11/rgb";|' vncserver}
+%{?_without_modxorg:%{__perl} -pi -e 's|^# (\$colorPath) = .+$|$1 = "/usr/X11R6/lib/X11/rgb";|' vncserver}
%{__cat} <<EOF >vncservers.sysconfig
# The VNCSERVERS variable is a list of display:user pairs.
@@ -132,63 +134,63 @@
desc="TightVNC remote administration daemon"
start() {
- echo -n $"Starting $desc ($prog):"
- ulimit -S -c 0 &>/dev/null
- for display in ${VNCSERVERS}; do
- echo -n "${display} "
- unset BASH_ENV ENV
- initlog $INITLOG_ARGS -c \
- "su ${display##*:} -c \"cd ~${display##*:} && [ -f .vnc/passwd ] && vncserver :${display%%:*}\""
- RETVAL=$?
- [ "$RETVAL" -ne 0 ] && break
- done
- [ "$RETVAL" -eq 0 ] && success $"vncserver startup" || failure $"vncserver start"
- echo
- [ "$RETVAL" -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Starting $desc ($prog):"
+ ulimit -S -c 0 &>/dev/null
+ for display in ${VNCSERVERS}; do
+ echo -n "${display} "
+ unset BASH_ENV ENV
+ initlog $INITLOG_ARGS -c \
+ "su ${display##*:} -c \"cd ~${display##*:} && [ -f .vnc/passwd ] && vncserver :${display%%:*}\""
+ RETVAL=$?
+ [ "$RETVAL" -ne 0 ] && break
+ done
+ [ "$RETVAL" -eq 0 ] && success $"vncserver startup" || failure $"vncserver start"
+ echo
+ [ "$RETVAL" -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
stop() {
- echo -n $"Shutting down $desc ($prog): "
- for display in ${VNCSERVERS}; do
- echo -n "${display} "
- unset BASH_ENV ENV
- initlog $INITLOG_ARGS -c \
- "su ${display##*:} -c \"vncserver -kill :${display%%:*}\" &>/dev/null"
- done
- RETVAL=$?
- [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || failure $"vncserver shutdown"
- echo
- [ "$RETVAL" -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Shutting down $desc ($prog): "
+ for display in ${VNCSERVERS}; do
+ echo -n "${display} "
+ unset BASH_ENV ENV
+ initlog $INITLOG_ARGS -c \
+ "su ${display##*:} -c \"vncserver -kill :${display%%:*}\" &>/dev/null"
+ done
+ RETVAL=$?
+ [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || failure $"vncserver shutdown"
+ echo
+ [ "$RETVAL" -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
restart() {
- stop
- start
+ stop
+ start
}
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart|reload)
- restart
- ;;
+ restart
+ ;;
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|condrestart|status}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
@@ -203,14 +205,14 @@
cd Xvnc
%configure
%{__make} CDEBUGFLAGS="%{optflags}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
- EXTRA_LIBRARIES="-lwrap -lnss_nis"
+ EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
+ EXTRA_LIBRARIES="-lwrap -lnss_nis"
%install
%{__rm} -rf %{buildroot}
%{__install} -d -m0755 %{buildroot}%{_bindir} \
- %{buildroot}%{_mandir}/man1/ \
- %{buildroot}%{_datadir}/vnc/
+ %{buildroot}%{_mandir}/man1/ \
+ %{buildroot}%{_datadir}/vnc/
./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir}
%{__cp} -apR classes %{buildroot}%{_datadir}/vnc/
@@ -219,13 +221,13 @@
%{__install} -Dp -m0644 vncservers.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/vncservers
%if %{?_without_freedesktop:1}0
- %{__install} -Dp -m0644 vncviewer.desktop %{buildroot}%{_datadir}/gnome/apps/Internet/vncviewer.desktop
+ %{__install} -Dp -m0644 vncviewer.desktop %{buildroot}%{_datadir}/gnome/apps/Internet/vncviewer.desktop
%else
- %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
- desktop-file-install --vendor %{desktop_vendor} \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- vncviewer.desktop
+ %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+ desktop-file-install --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ vncviewer.desktop
%endif
%clean
@@ -236,8 +238,8 @@
%preun server
if [ $1 -eq 0 ]; then
- /sbin/service vncserver stop &>/dev/null || :
- /sbin/chkconfig --del vncserver
+ /sbin/service vncserver stop &>/dev/null || :
+ /sbin/chkconfig --del vncserver
fi
%postun server
@@ -267,6 +269,9 @@
%{_datadir}/vnc/
%changelog
+* Thu Mar 13 2008 Dag Wieers <dag at wieers.com> - 1.3.9-2
+- Added fix for rgb.txt support. (Alberto Lusiani)
+
* Tue May 08 2007 Dag Wieers <dag at wieers.com> - 1.3.9-1
- Updated to release 1.3.9.
More information about the svn-commits
mailing list