[svn] r5320 - in trunk/rpms: . clamav dstat libxclass linkloop multitail rfb rtorrent trac xine

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sat Apr 28 13:10:42 CEST 2007 

Author: dag
Date: 2007-04-28 13:10:41 +0200 (Sat, 28 Apr 2007)
New Revision: 5320

Added:
   trunk/rpms/linkloop/
   trunk/rpms/linkloop/linkloop.spec
Modified:
   trunk/rpms/clamav/clamav.spec
   trunk/rpms/dstat/dstat.spec
   trunk/rpms/libxclass/libxclass.spec
   trunk/rpms/multitail/multitail.spec
   trunk/rpms/rfb/rfb.spec
   trunk/rpms/rtorrent/rtorrent.spec
   trunk/rpms/trac/trac.spec
   trunk/rpms/xine/xine.spec
Log:
Updates

Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/clamav/clamav.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -6,12 +6,13 @@
 ### FIXME: amavisd-new requires clamd to run as user vscan, solution needed
 ### REMINDER: Look and sync with Petr Kristof's work
 
-%{?el2:%define _without_milter 1}
+### sendmail has been updated on EL2, no longer true.
+#{?el2:%define _without_milter 1}
 
 Summary: Anti-virus software
 Name: clamav
 Version: 0.90.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 URL: http://www.clamav.net/
@@ -358,6 +359,9 @@
 %{_libdir}/pkgconfig/libclamav.pc
 
 %changelog
+* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 0.90.2-2
+- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen)
+
 * Sun Apr 15 2007 Dag Wieers <dag at wieers.com> - 0.90.2-1
 - Updated to release 0.90.2.
 

Modified: trunk/rpms/dstat/dstat.spec
===================================================================
--- trunk/rpms/dstat/dstat.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/dstat/dstat.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -9,7 +9,7 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.5
+Version: 0.6.6
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -45,7 +45,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
-%{__install} -Dp -m0644 docs/dstat.1 %{buildroot}%{_mandir}/man1/dstat.1
 
 %{?_with_python15:%{__install} -Dp -m0755 dstat15 %{buildroot}%{_bindir}/dstat}
 
@@ -61,6 +60,9 @@
 %{_datadir}/dstat/
 
 %changelog
+* Sat Apr 28 2007 Dag Wieers <dag at wieers.com> - 0.6.6-1
+- Updated to release 0.6.6.
+
 * Tue Apr 17 2007 Dag Wieers <dag at wieers.com> - 0.6.5-1
 - Updated to release 0.6.5.
 

Modified: trunk/rpms/libxclass/libxclass.spec
===================================================================
--- trunk/rpms/libxclass/libxclass.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/libxclass/libxclass.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -33,7 +33,6 @@
 %{?_without_modxorg:BuildRequires: XFree86-devel}
 %{!?_without_modxorg:BuildRequires: libXt-devel, libXmu-devel, libXpm-devel, libXext-devel}
 %{?fc4:BuildRequires: compat-gcc-32-c++}
-%{?el4:BuildRequires: compat-gcc-c++}
 %{?fc3:BuildRequires: compat-gcc-c++}
 %{?fc2:BuildRequires: compat-gcc-c++}
 %{?fc1:BuildRequires: compat-gcc-c++}
@@ -96,15 +95,12 @@
 %doc doc/ChangeLog doc/GPL doc/LGPL doc/LICENSE doc/tcl.license.terms doc/tk.license.terms
 %doc doc/INSTALL doc/Layout.notes doc/MimeTypes.README doc/Programming.notes
 %config(noreplace) %{_sysconfdir}/xclass/
-%{_datadir}/xclass/
 %{_bindir}/xc-config
+%{_datadir}/xclass/
 %{_includedir}/xclass/
-%{_libdir}/*
+%{_libdir}/libxclass.a
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.9.1-1.2
-- Rebuild for Fedora Core 5.
-
 * Sun Nov 13 2005 Dries Verachtert <dries at ulyssis.org> - 0.9.1-1
 - Updated to release 0.9.1.
 

Added: trunk/rpms/linkloop/linkloop.spec
===================================================================
--- trunk/rpms/linkloop/linkloop.spec	                        (rev 0)
+++ trunk/rpms/linkloop/linkloop.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -0,0 +1,46 @@
+# $Id$
+# Authority: dag
+# Upstream: 
+
+Summary: Tool to test connectivity at the link layer (layer 2)
+Name: linkloop
+Version: 1.0.0
+Release: 1
+License: GPL
+Group: Applications/Internet
+URL: http://sourceforge.net/projects/linkloop/
+
+Source: http://dl.sf.net/linkloop/linkloop-%{version}-hp.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+linkloop is a similar tool to ping, but tests connectivity at the link layer
+(layer 2) instead of the network layer (layer 3). It works like the HP-UX
+linkloop utility.
+
+%prep
+%setup -n %{name}-%{version}-hp
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" linkloop_replydir="%{_initrddir}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%doc %{_mandir}/man1/linkloop.1*
+%config %{_initrddir}/linkloopd
+%{_bindir}/lanscan
+%{_bindir}/linkloop_reply
+%{_bindir}/linkloop
+
+%changelog
+* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 1.0.0-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/linkloop/linkloop.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/multitail/multitail.spec
===================================================================
--- trunk/rpms/multitail/multitail.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/multitail/multitail.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -7,7 +7,7 @@
 
 Summary: View one or multiple files like tail but with multiple windows
 Name: multitail
-Version: 5.0.0
+Version: 5.0.1
 Release: 1
 License: GPL
 Group: Applications/Text
@@ -41,24 +41,34 @@
 %{__install} -d -m0755 %{buildroot}%{_mandir}/man1/
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
+
+### Prepare documentation
+%{__install} -d -m0755 scripts/
+%{__install} -p -m0644 *.pl *.sh scripts/
+
+### Clean up buildroot
 %{__mv} -f %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/multitail/convert-geoip.pl 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes INSTALL *.conf *.html *.txt
+%doc Changes INSTALL *.conf *.html *.txt scripts/
 %doc %{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
-%dir %{_sysconfdir}/multitail
+%dir %{_sysconfdir}/multitail/
 %{_sysconfdir}/multitail/colors-example.pl
 %{_sysconfdir}/multitail/colors-example.sh
-%{_sysconfdir}/multitail/convert-geoip.pl
 %{_sysconfdir}/multitail/convert-simple.pl
 
 %changelog
+* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 5.0.1-1
+- Updated to release 5.0.1.
+- Removed perl-Geo-IP from dependencies by moving it to %%doc. (Michael Mansour)
+
 * Mon Apr 16 2007 Dries Verachtert <dries at ulyssis.org> - 5.0.0-1
 - Updated to release 5.0.0.
 

Modified: trunk/rpms/rfb/rfb.spec
===================================================================
--- trunk/rpms/rfb/rfb.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/rfb/rfb.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -11,13 +11,14 @@
 Summary: heXoNet RFB (remote control for the X Window System)
 Name: rfb
 Version: 0.6.1
-Release: 5.2
+Release: 6
 License: GPL
 Group: User Interface/Desktops
 URL: http://www.hexonet.de/software/rfb/
 
-Source: http://download.hexonet.com/software/rfb/%{name}-%{version}.tar.gz
-Patch: rfb-0.6.1-rpmoptflags.patch
+Source: http://download.hexonet.com/software/rfb/rfb-%{version}.tar.gz
+Patch0: rfb-0.6.1-rpmoptflags.patch
+Patch1: rfb-0.6.1-11-debian.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: libxclass
@@ -42,6 +43,7 @@
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %{__cat} <<EOF >x0rfbserver.desktop
 [Desktop Entry]
@@ -82,18 +84,18 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_mandir}/man1/
-%{__install} -p -m0644 man/man1/* %{buildroot}%{_mandir}/man1/
+%{__install} -p -m0644 man/man1/*.1* %{buildroot}%{_mandir}/man1/
 %{__install} -Dp -m0755 x0rfbserver/x0rfbserver %{buildroot}%{_bindir}/x0rfbserver
 %{__install} -Dp -m0755 xvncconnect/xvncconnect %{buildroot}%{_bindir}/xvncconnect
 %{__install} -Dp -m0755 xrfbviewer/xplayfbs %{buildroot}%{_bindir}/xplayfbs
 %{__install} -Dp -m0755 xrfbviewer/xrfbviewer %{buildroot}%{_bindir}/xrfbviewer
-%{__install} -Dp -m0755 rfbcat/rfbcat %{buildroot}%{_bindir}/rfbcat
+#%{__install} -Dp -m0755 rfbcat/rfbcat %{buildroot}%{_bindir}/rfbcat
 
 %if %{?_without_freedesktop:1}0
 	%{__install} -Dp -m0644 x0rfbserver.desktop %{buildroot}%{_datadir}/gnome/apps/Utilities/x0rfbserver.desktop
 	%{__install} -Dp -m0644 xvncconnect.desktop %{buildroot}%{_datadir}/gnome/apps/Utilities/xvncconnect.desktop
 %else
-        install -d -m0755 %{buildroot}%{_datadir}/applications
+        %{__install} -d -m0755 %{buildroot}%{_datadir}/applications
         desktop-file-install --vendor "%{desktop_vendor}"  \
                 --add-category X-Red-Hat-Base              \
                 --dir %{buildroot}%{_datadir}/applications \
@@ -106,14 +108,21 @@
 %files
 %defattr(-, root, root, 0755)
 %doc COPYING INSTALL README rfm_fbs.1.0.html
-%doc %{_mandir}/man?/*
-%{_bindir}/*
-%{?_without_freedesktop:%{_datadir}/gnome/apps/Utilities/*.desktop}
-%{!?_without_freedesktop:%{_datadir}/applications/*.desktop}
+%doc %{_mandir}/man1/x0rfbserver.1*
+%doc %{_mandir}/man1/xplayfbs.1*
+%doc %{_mandir}/man1/xrfbviewer.1*
+%{_bindir}/x0rfbserver
+%{_bindir}/xvncconnect
+%{_bindir}/xplayfbs
+%{_bindir}/xrfbviewer
+%{?_without_freedesktop:%{_datadir}/gnome/apps/Utilities/x0rfbserver.desktop}
+%{?_without_freedesktop:%{_datadir}/gnome/apps/Utilities/xvncconnect.desktop}
+%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-x0rfbserver.desktop}
+%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-xvncconnect.desktop}
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.6.1-5.2
-- Rebuild for Fedora Core 5.
+* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 0.6.1-6
+- Added Debian patch set.
 
 * Sun Nov  6 2005 Matthias Saou <http://freshrpms.net/> 0.6.1-5
 - Remove /usr/X11R6/bin bindir, it's obsoleted with the newest X.org server.

Modified: trunk/rpms/rtorrent/rtorrent.spec
===================================================================
--- trunk/rpms/rtorrent/rtorrent.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/rtorrent/rtorrent.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -1,6 +1,8 @@
 # $Id$
 # Authority: dries
 
+%{?el4:%define _without_curl_pc 1}
+
 Summary: Console based bittorrent client
 Name: rtorrent
 Version: 0.7.4
@@ -25,9 +27,9 @@
 %setup
 
 %build
-### FIXME: Why does curl-compilation fail without the libsigc++20 includes
-export STUFF_CFLAGS="$(curl-config --cflags) $(pkg-config sigc++-2.0 --cflags)"
-export STUFF_LIBS="$(curl-config --libs) $(pkg-config sigc++-2.0 --libs) -ltorrent"
+### FIXME: Why does curl-compilation fail without the libsigc++20 includes on EL4 ?
+%{?_without_curl_pc:export STUFF_CFLAGS="$(curl-config --cflags) $(pkg-config sigc++-2.0 --cflags)"}
+%{?_without_curl_pc:export STUFF_LIBS="$(curl-config --libs) $(pkg-config sigc++-2.0 --libs) -ltorrent"}
 %configure
 %{__make} %{?_smp_mflags}
 

Modified: trunk/rpms/trac/trac.spec
===================================================================
--- trunk/rpms/trac/trac.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/trac/trac.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -6,7 +6,7 @@
 
 Name: trac
 Summary: Integrated SCM and project management tool
-Version: 0.10.3.1
+Version: 0.10.4
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -78,6 +78,9 @@
 %{_localstatedir}/lib/trac/
 
 %changelog
+* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 0.10.4-1
+- Updated to release 0.10.4.
+
 * Sat Mar 10 2007 Dag Wieers <dag at wieers.com> - 0.10.3.1-1
 - Updated to release 0.10.3.1.
 

Modified: trunk/rpms/xine/xine.spec
===================================================================
--- trunk/rpms/xine/xine.spec	2007-04-28 08:31:07 UTC (rev 5319)
+++ trunk/rpms/xine/xine.spec	2007-04-28 11:10:41 UTC (rev 5320)
@@ -108,7 +108,7 @@
 
 %build
 %configure \
-    %{?_without_lirc:--disable-lirc}
+%{?_without_lirc:--disable-lirc}
 %{__make} %{?_smp_mflags}

More information about the svn-commits mailing list