[svn] r5109 - in trunk/rpms: cadaver clusterssh djvulibre linkchecker nagios perl-Expect spamassassin unfs3 xmule

Wed Jan 24 20:29:15 CET 2007

Author: dag
Date: 2007-01-24 20:29:13 +0100 (Wed, 24 Jan 2007)
New Revision: 5109

Modified:
   trunk/rpms/cadaver/cadaver.spec
   trunk/rpms/clusterssh/clusterssh.spec
   trunk/rpms/djvulibre/djvulibre.spec
   trunk/rpms/linkchecker/linkchecker.spec
   trunk/rpms/nagios/nagios.spec
   trunk/rpms/perl-Expect/perl-Expect.spec
   trunk/rpms/spamassassin/spamassassin.spec
   trunk/rpms/unfs3/unfs3.spec
   trunk/rpms/xmule/xmule.spec
Log:
Updates

Modified: trunk/rpms/cadaver/cadaver.spec
===================================================================

--- trunk/rpms/cadaver/cadaver.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/cadaver/cadaver.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -12,8 +12,8 @@
 
 Summary: Command-line WebDAV client
 Name: cadaver
-Version: 0.22.2
-Release: 1.2
+Version: 0.22.5
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.webdav.org/cadaver/
@@ -42,19 +42,20 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc ChangeLog COPYING FAQ NEWS README THANKS TODO
 %doc %{_mandir}/man1/cadaver.1*
 %{_bindir}/cadaver
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.22.2-1.2
-- Rebuild for Fedora Core 5.
+* Tue Jan 23 2007 Dag Wieers <dag at wieers.com> - 0.22.5-1
+- Updated to release 0.22.5.
 
 * Sat Dec 04 2004 Dag Wieers <dag at wieers.com> - 0.22.2-1
 - Updated to release 0.22.2.

Modified: trunk/rpms/clusterssh/clusterssh.spec
===================================================================
--- trunk/rpms/clusterssh/clusterssh.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/clusterssh/clusterssh.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -4,24 +4,27 @@
 
 %define perl_version %(eval "$(%{__perl} -V:version)"; echo $version)
 
+%define vendor_desktop rpmforge
+
 Summary: Secure concurrent multi-server terminal control
 Name: clusterssh
-Version: 3.17.1
+Version: 3.19.1
 Release: 1
 License: GPL
-Group: Applications/Productivity
+Group: Applications/Internet
 URL: http://clusterssh.sourceforge.net/
 
-Source: http://download.sourceforge.net/clusterssh/clusterssh-%{version}.tar.gz
+Source: http://dl.sf.net/clusterssh/clusterssh-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
-BuildRequires: perl => 1:5.6.1, perl(Tk), perl(X11::Protocol)
+BuildRequires: perl => 1:5.6.1, perl(Tk), perl(X11::Protocol), desktop-file-utils
 Requires: perl(:MODULE_COMPAT_%{perl_version})
 
 %description
 Control multiple terminals open on different servers to perform administration
-tasks.
+tasks, for example multiple hosts requiring the same config within a cluster.
+Not limited to use with clusters, however.
 
 %prep
 %setup
@@ -34,6 +37,21 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 
+%{__install} -Dp -m0644 clusterssh-24x24.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/clusterssh.png
+%{__install} -Dp -m0644 clusterssh-32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/clusterssh.png
+%{__install} -Dp -m0644 clusterssh-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/clusterssh.png
+%{__mkdir_p} %{buildroot}%{_datadir}/applications/
+desktop-file-install --vendor %{desktop_vendor}    \
+	--add-category X-Red-Hat-Base              \
+	--dir %{buildroot}%{_datadir}/applications \
+	clusterssh.desktop
+
+%post
+%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -42,7 +60,14 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %doc %{_mandir}/man1/cssh.1*
 %{_bindir}/cssh
+%{_datadir}/applications/%{desktop_vendor}-clusterssh.desktop
+%{_datadir}/icons/hicolor/24x24/apps/clusterssh.png
+%{_datadir}/icons/hicolor/32x32/apps/clusterssh.png
+%{_datadir}/icons/hicolor/48x48/apps/clusterssh.png
 
 %changelog
+* Wed Jan 24 2007 Dag Wieers <dag at wieers.com> - 3.19.1-1
+- Updated to release 3.19.1.
+
 * Thu Aug 18 2005 Duncan Ferguson <duncan_ferguson at users.sf.net> - 3.17.1-1
 - Initial version.

Modified: trunk/rpms/djvulibre/djvulibre.spec
===================================================================
--- trunk/rpms/djvulibre/djvulibre.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/djvulibre/djvulibre.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -3,13 +3,15 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?rh9:%define _without_modxorg 1}
+%{?rh7:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
 
 Summary: DjVu viewers, encoders and utilities
 Name: djvulibre
@@ -55,7 +57,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 #find_lang %{name}
 
 %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins
@@ -91,6 +93,7 @@
 %{_datadir}/application-registry/djvu.applications
 %{_datadir}/applications/djview.desktop
 %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png
+%{_datadir}/mimelnk/image/x-djvu.desktop
 %{_datadir}/mime-info/djvu.*
 %{_datadir}/djvu/
 %{_datadir}/pixmaps/djvu.png

Modified: trunk/rpms/linkchecker/linkchecker.spec
===================================================================
--- trunk/rpms/linkchecker/linkchecker.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/linkchecker/linkchecker.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -15,8 +15,7 @@
 Source: http://dl.sf.net/linkchecker/linkchecker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: python, gettext
-BuildRequires: python-devel >= 2.4
+BuildRequires: python-devel >= 2.4, gettext
 Requires: python >= 2.4
 
 %description
@@ -30,8 +29,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__python} setup.py install \
-	--root="%{buildroot}"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,7 +44,6 @@
 %{python_dir}/linkcheck/
 %{python_dir}/_linkchecker_configdata.py*
 
-
 %changelog
 * Mon Dec 18 2006 Dries Verachtert <dries at ulyssis.org> - 4.6-1
 - Updated to release 4.6.
@@ -63,9 +60,6 @@
 * Sat May 20 2006 Dries Verachtert <dries at ulyssis.org> - 4.0-1
 - Updated to release 4.0.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 3.3-1.2
-- Rebuild for Fedora Core 5.
-
 * Sat Oct 15 2005 Dries Verachtert <dries at ulyssis.org> - 3.3-1
 - Updated to release 3.3.
 

Modified: trunk/rpms/nagios/nagios.spec
===================================================================
--- trunk/rpms/nagios/nagios.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/nagios/nagios.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -14,7 +14,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: nagios
-Version: 2.6
+Version: 2.7
 Release: 1
 License: GPL
 Group: Applications/System
@@ -185,6 +185,9 @@
 %{_includedir}/nagios/
 
 %changelog
+* Wed Jan 24 2007 Dag Wieers <dag at wieers.com> - 2.7-1
+- Updated to release 2.7.
+
 * Mon Dec 11 2006 Dag Wieers <dag at wieers.com> - 2.6-1
 - Updated to release 2.6.
 

Modified: trunk/rpms/perl-Expect/perl-Expect.spec
===================================================================
--- trunk/rpms/perl-Expect/perl-Expect.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/perl-Expect/perl-Expect.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -1,14 +1,10 @@
 # $Id$
-
 # Authority: dries
 # Upstream: Roland Giersig <RGiersig$cpan,org>
 
+%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
 
 %define real_name Expect
-%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
-%define perl_archlib %(eval "`perl -V:archlib`"; echo $archlib)
-%define perl_privlib %(eval "`perl -V:privlib`"; echo $privlib)
 
 Summary: Expect for perl
 Name: perl-Expect

Modified: trunk/rpms/spamassassin/spamassassin.spec
===================================================================
--- trunk/rpms/spamassassin/spamassassin.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/spamassassin/spamassassin.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -25,7 +25,7 @@
 
 BuildRequires: perl(HTML::Parser) >= 3.24, perl(Net::DNS), perl(Time::HiRes), openssl-devel
 Requires: procmail, perl(Net::DNS), perl(Time::HiRes), perl-libwww-perl
-Requires: perl(Archive::Tar), perl(IO::Zlib)
+Requires: perl(Archive::Tar) >= 1.23, perl(IO::Zlib)
 Requires: /sbin/chkconfig, /sbin/service
 #Requires: perl(Mail::SpamAssassin) = %{version}-%{release}
 Provides: perl(Mail::SpamAssassin) = %{version}-%{release}

Modified: trunk/rpms/unfs3/unfs3.spec
===================================================================
--- trunk/rpms/unfs3/unfs3.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/unfs3/unfs3.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -5,7 +5,7 @@
 
 Summary: UNFS3 user-space NFSv3 server
 Name: unfs3
-Version: 0.9.16
+Version: 0.9.17
 Release: 1
 License: BSD
 Group: Applications/System
@@ -44,6 +44,9 @@
 %{_sbindir}/unfsd
 
 %changelog
+* Mon Jan 22 2007 Dag Wieers <dag at wieers.com> - 0.9.17-1
+- Updated to release 0.9.17.
+
 * Tue Nov 07 2006 Dag Wieers <dag at wieers.com> - 0.9.16-1
 - Updated to release 0.9.16.
 

Modified: trunk/rpms/xmule/xmule.spec
===================================================================
--- trunk/rpms/xmule/xmule.spec	2007-01-24 10:00:49 UTC (rev 5108)
+++ trunk/rpms/xmule/xmule.spec	2007-01-24 19:29:13 UTC (rev 5109)
@@ -12,7 +12,7 @@
 Patch: xmule-1.10.0-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: /usr/sbin/alternatives
-BuildRequires: gcc-c++, wxGTK2-devel >= 2.4.2, zlib-devel, gettext
+BuildRequires: gcc-c++, wxGTK-devel >= 2.4.2, zlib-devel, gettext
 BuildRequires: cryptopp-devel
 # Required by xrc
 BuildRequires: expat-devel

