[svn] r5188 - in trunk/rpms: . arpd blender elmo fragroute honeyd libdnsres libevent libupnp memcached nttlscan perl-Net-Server tor trickle ushare vomit

Wed Feb 21 01:19:21 CET 2007

Author: dag
Date: 2007-02-21 01:19:18 +0100 (Wed, 21 Feb 2007)
New Revision: 5188

Added:
   trunk/rpms/libupnp/
   trunk/rpms/libupnp/libupnp.spec
   trunk/rpms/ushare/
   trunk/rpms/ushare/ushare.spec
Modified:
   trunk/rpms/arpd/arpd.spec
   trunk/rpms/blender/blender.spec
   trunk/rpms/elmo/elmo.spec
   trunk/rpms/fragroute/fragroute.spec
   trunk/rpms/honeyd/honeyd.spec
   trunk/rpms/libdnsres/libdnsres.spec
   trunk/rpms/libevent/libevent.spec
   trunk/rpms/memcached/memcached-1.1.spec
   trunk/rpms/memcached/memcached.spec
   trunk/rpms/nttlscan/nttlscan.spec
   trunk/rpms/perl-Net-Server/perl-Net-Server.spec
   trunk/rpms/tor/tor.spec
   trunk/rpms/trickle/trickle.spec
   trunk/rpms/vomit/vomit.spec
Log:
Updates

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

--- trunk/rpms/arpd/arpd.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/arpd/arpd.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -4,15 +4,16 @@
 %{?dist: %{expand: %%define %dist 1}}
 
 %{!?dist:%define _with_libpcapdevel 1}
+%{?fc7:%define _with_libpcapdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 Summary: ARP reply daemon
 Name: arpd
 Version: 0.2
-Release: 2
+Release: 3
 License: OpenSource
 Group: Applications/Internet
-URL: http://www.citi.umich.edu/u/provos/arpd/
+URL: http://www.honeyd.org/tools.php
 
 Source: http://www.citi.umich.edu/u/provos/honeyd/arpd-%{version}.tar.gz
 Patch: arpd-0.2-gcc4.patch
@@ -39,7 +40,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,6 +52,9 @@
 %{_sbindir}/arpd
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.2-3
+- Rebuild against libevent-1.3a.
+
 * Sat Sep 03 2005 Dag Wieers <dag at wieers.com> - 0.2-2
 - Fixed a problem with gcc4. (Francisco Monserrat)
 

Modified: trunk/rpms/blender/blender.spec
===================================================================
--- trunk/rpms/blender/blender.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/blender/blender.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -58,7 +58,6 @@
 
 %build
 #scons clean
-#export BF_PYTHON_INC="%{python_inc}"
 scons BF_PYTHON_INC="%{python_inc}"
 
 %install

Modified: trunk/rpms/elmo/elmo.spec
===================================================================
--- trunk/rpms/elmo/elmo.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/elmo/elmo.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -15,7 +15,7 @@
 Source: http://dl.sf.net/elmo/elmo-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# It compiles but does not work without gpgme-devel
+### It compiles but does not work without gpgme-devel
 BuildRequires: gpgme-devel, openssl-devel, bison, gcc-c++
 BuildRequires: ncurses-devel, flex, gettext, krb5-devel
 
@@ -28,12 +28,12 @@
 %setup
 
 %build
-%configure --enable-debug CPPFLAGS=-I/usr/kerberos/include
+%configure --enable-debug CPPFLAGS="-I/usr/kerberos/include"
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %find_lang %{name}
 
 %clean
@@ -42,16 +42,14 @@
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc ADVOCACY AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS TODO
-%doc doc/README.txt doc/sample.elmorc doc/tutorial.gpg TODO
-%doc %{_mandir}/man?/*
+%doc doc/README.txt doc/sample.elmorc doc/tutorial.gpg
+%doc %{_mandir}/man1/elmo.1*
+%doc %{_mandir}/man1/elmoconf.pl.1*
 %{_bindir}/elmo
 %{_bindir}/elmoconf.pl
-%{_datadir}/elmo
+%{_datadir}/elmo/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.3.2-1.2
-- Rebuild for Fedora Core 5.
-
 * Thu Jun 09 2005 Dries Verachtert <dries at ulyssis.org> - 1.3.2-1
 - Update to release 1.3.2.
 

Modified: trunk/rpms/fragroute/fragroute.spec
===================================================================
--- trunk/rpms/fragroute/fragroute.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/fragroute/fragroute.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -5,12 +5,13 @@
 %{?dist: %{expand: %%define %dist 1}}
 
 %{!?dist:%define _with_libpcapdevel 1}
+%{?fc7:%define _with_libpcapdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 Summary: Intercepts, modifies, and rewrites egress traffic
 Name: fragroute
 Version: 1.2
-Release: 1
+Release: 2
 License: BSD
 Group: Applications/Internet
 URL: http://www.monkey.org/~dugsong/fragroute/
@@ -51,6 +52,9 @@
 %{_sbindir}/fragtest
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.2-2
+- Rebuild against libevent-1.3a.
+
 * Wed Mar 31 2004 Dag Wieers <dag at wieers.com> - 1.2-1
 - Cosmetic rebuild for Group-tag.
 

Modified: trunk/rpms/honeyd/honeyd.spec
===================================================================
--- trunk/rpms/honeyd/honeyd.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/honeyd/honeyd.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -1,19 +1,20 @@
-# $Id$
+# $Id: honeyd.spec 4899 2006-11-18 23:37:30Z dag $
 # Authority: dag
 # Upstream: Niels Provos <provos$citi,umich,edu>
 
 %{?dist: %{expand: %%define %dist 1}}
 
 %{!?dist:%define _with_libpcapdevel 1}
+%{?fc7:%define _with_libpcapdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 Summary: Honeypot daemon
 Name: honeyd
 Version: 1.5b
-Release: 1
+Release: 3
 License: BSD
 Group: Applications/Internet
-URL: http://www.citi.umich.edu/u/provos/honeyd/
+URL: http://www.honeyd.org/
 
 Source: http://www.citi.umich.edu/u/provos/honeyd/honeyd-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +63,10 @@
 %{_libdir}/honeyd/
 
 %changelog
-* Sun Aug 20 2006 Dag Wieers <dag at wieers.com> - 0.2-3
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.5b-3
+- Rebuild against libevent-1.3b.
+
+* Sun Aug 20 2006 Dag Wieers <dag at wieers.com> - 1.5b-2
 - Rebuild against libevent-1.1b.
 
 * Sat Aug 19 2006 Dag Wieers <dag at wieers.com> - 1.5b-1

Modified: trunk/rpms/libdnsres/libdnsres.spec
===================================================================
--- trunk/rpms/libdnsres/libdnsres.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/libdnsres/libdnsres.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -6,7 +6,7 @@
 Summary: Non-blocking DNS resolver library
 Name: libdnsres
 Version: 0.1a
-Release: 1.2
+Release: 2
 License: BSD-like
 Group: System Environment/Libraries
 URL: http://www.monkey.org/~provos/libdnsres/
@@ -37,9 +37,8 @@
 %setup
 
 %build
-%configure
-%{__make} %{?_smp_mflags} \
-	COPTFLAG="%{optflags}"
+%configure --with-pic
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -57,15 +56,12 @@
 %doc %{_mandir}/man3/dnsres.3*
 %{_includedir}/dnsres.h
 %{_libdir}/libdnsres.a
-%{_libdir}/libdnsres.so
 %exclude %{_libdir}/libdnsres.la
+%{_libdir}/libdnsres.so
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.1a-1.2
-- Rebuild for Fedora Core 5.
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1a-2
+- Rebuild against libevent-1.3b.
 
-* Tue Feb 21 2006 Dag Wieers <dag at wieers.com> - 1.11-1
-- Updated to release 1.11.
-
-* Wed Oct 22 2003 Dag Wieers <dag at wieers.com> - 1.7-0
+* Tue Feb 21 2006 Dag Wieers <dag at wieers.com> - 0.1a-1
 - Initial package. (using DAR)

Modified: trunk/rpms/libevent/libevent.spec
===================================================================
--- trunk/rpms/libevent/libevent.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/libevent/libevent.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -4,7 +4,7 @@
 
 Summary: Abstract asynchronous event notification library
 Name: libevent
-Version: 1.2a
+Version: 1.3a
 Release: 1
 License: BSD
 Group: System Environment/Libraries
@@ -69,6 +69,9 @@
 %exclude %{_libdir}/libevent.la
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.3a-1
+- Updated to release 1.3a.
+
 * Sun Dec 10 2006 Dag Wieers <dag at wieers.com> - 1.2a-1
 - Updated to release 1.2a.
 

Added: trunk/rpms/libupnp/libupnp.spec
===================================================================
--- trunk/rpms/libupnp/libupnp.spec	                        (rev 0)
+++ trunk/rpms/libupnp/libupnp.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -0,0 +1,74 @@
+# $Id$
+# Authority: dag
+
+Summary: Universal Plug and Play (UPnP) SDK
+Name: libupnp
+Version: 1.4.2
+Release: 1
+License: BSD
+Group: System Environment/Libraries
+URL: http://pupnp.sourceforge.net/
+
+Source: http://dl.sf.net/pupnp/libupnp-%{version}.tar.bz2
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+The Universal Plug and Play (UPnP) SDK for Linux provides 
+support for building UPnP-compliant control points, devices, 
+and bridges on Linux.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup
+
+%build
+%configure --with-documentation="/rpm-doc"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+### Clean up buildroot
+%{__mv} -f %{buildroot}/rpm-doc/ .
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING INSTALL LICENSE NEWS README THANKS TODO
+%{_libdir}/libixml.so.*
+%{_libdir}/libthreadutil.so.*
+%{_libdir}/libupnp.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%doc rpm-doc/*
+%{_includedir}/upnp/
+%{_libdir}/libixml.a
+%{_libdir}/libixml.so
+%{_libdir}/libthreadutil.a
+%{_libdir}/libthreadutil.so
+%{_libdir}/libupnp.a
+%{_libdir}/libupnp.so
+%{_libdir}/pkgconfig/libupnp.pc
+%exclude %{_libdir}/libixml.la
+%exclude %{_libdir}/libthreadutil.la
+%exclude %{_libdir}/libupnp.la
+
+%changelog
+* Wed Feb 21 2007 Dag Wieers <dag at wieers.com> - 1.4.2-1
+- Initial package. (using DAR)


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

Modified: trunk/rpms/memcached/memcached-1.1.spec
===================================================================
--- trunk/rpms/memcached/memcached-1.1.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/memcached/memcached-1.1.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -5,7 +5,7 @@
 Summary: Distributed memory object caching system
 Name: memcached
 Version: 1.1.13
-Release: 2
+Release: 3
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.danga.com/memcached/
@@ -23,7 +23,6 @@
 generic in nature, but intended for use in speeding up dynamic web
 applications by alleviating database load.
 
-
 %prep
 %setup
 
@@ -126,7 +125,6 @@
 exit $RETVAL
 EOF
 
-
 %build
 %configure \
 	--program-prefix="%{?_program_prefix}" \
@@ -138,12 +136,9 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 
-%{__install} -D -m0755 memcached.sysv \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/memcached
-%{__install} -D -m0644 memcached.sysconfig \
-    %{buildroot}%{_sysconfdir}/sysconfig/memcached
+%{__install} -D -m0755 memcached.sysv %{buildroot}%{_sysconfdir}/rc.d/init.d/memcached
+%{__install} -D -m0644 memcached.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/memcached
 
-
 %post
 /sbin/chkconfig --add memcached
 
@@ -160,19 +155,20 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING doc/*.txt NEWS README TODO
+%doc %{_mandir}/man1/memcached.1*
 %config(noreplace) %{_sysconfdir}/sysconfig/memcached
 %config %{_initrddir}/memcached
 %{_bindir}/memcached
 %{_bindir}/memcached-debug
-%{_mandir}/man1/memcached.1*
 
-
 %changelog
-* Wed Nov 01 2006 Dag Wieers <dag at wieers.com> - 1.1.13-2
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.1.13-3
+- Rebuild against libevent-1.3a.
+
+* Mon Feb 19 2007 Dag Wieers <dag at wieers.com> - 1.1.13-2
 - Rebuild against libevent-1.2a.
 
 * Wed Nov 01 2006 Dag Wieers <dag at wieers.com> - 1.1.13-1

Modified: trunk/rpms/memcached/memcached.spec
===================================================================
--- trunk/rpms/memcached/memcached.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/memcached/memcached.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: memcached.spec 4876 2006-11-11 11:55:45Z dag $
 # Authority: dag
 # Upstream: Brad Fitzpatrick <brad$danga,com>
 
 Summary: Distributed memory object caching system
 Name: memcached
 Version: 1.2.1
-Release: 1
+Release: 2
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.danga.com/memcached/
@@ -165,6 +165,9 @@
 %{_bindir}/memcached-debug
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.2.1-2
+- Rebuild against libevent-1.3a.
+
 * Mon Feb 19 2007 Dag Wieers <dag at wieers.com> - 1.2.1-1
 - Updated to release 1.2.1.
 

Modified: trunk/rpms/nttlscan/nttlscan.spec
===================================================================
--- trunk/rpms/nttlscan/nttlscan.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/nttlscan/nttlscan.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -1,19 +1,20 @@
-# $Id$
+# $Id: nttlscan.spec 4899 2006-11-18 23:37:30Z dag $
 # Authority: dag
 # Upstream:
 
 %{?dist: %{expand: %%define %dist 1}}
 
 %{!?dist:%define _with_libpcapdevel 1}
+%{?fc7:%define _with_libpcapdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 Summary: Quick network topology scanner
 Name: nttlscan
 Version: 0.1
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/Internet
-URL: http://www.honeyd.org/
+URL: http://www.honeyd.org/tools.php
 
 Source: http://www.honeyd.org/data/nttlscan-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -37,7 +38,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -48,7 +49,8 @@
 %{_bindir}/nttlscan
 
 %changelog
-* Fri Sep 03 2004 Dag Wieers <dag at wieers.com> - 0.1-1
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1-2
+- Rebuild against libevent-1.3a.
 - Added missing BuildRequires. (Robert Hardy)
 
 * Sat Jul 10 2004 Dag Wieers <dag at wieers.com> - 0.1-1

Modified: trunk/rpms/perl-Net-Server/perl-Net-Server.spec
===================================================================
--- trunk/rpms/perl-Net-Server/perl-Net-Server.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/perl-Net-Server/perl-Net-Server.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -8,7 +8,7 @@
 
 Summary: Net-Server module for perl
 Name: perl-Net-Server
-Version: 0.94
+Version: 0.95
 Release: 1
 License: Artistic
 Group: Applications/CPAN
@@ -49,8 +49,12 @@
 %dir %{perl_vendorlib}/Net/
 %{perl_vendorlib}/Net/Server/
 %{perl_vendorlib}/Net/Server.pm
+%{perl_vendorlib}/Net/Server.pod
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.95-1
+- Updated to release 0.95.
+
 * Thu Jul 13 2006 Dag Wieers <dag at wieers.com> - 0.94-1
 - Updated to release 0.94.
 

Modified: trunk/rpms/tor/tor.spec
===================================================================
--- trunk/rpms/tor/tor.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/tor/tor.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -9,7 +9,7 @@
 Summary: Send network traffic through virtual tunnels to improve your privacy
 Name: tor
 Version: 0.1.1.26
-Release: 1
+Release: 2
 License: BSD
 Group: Applications/Internet
 URL: http://tor.eff.org/
@@ -34,19 +34,21 @@
 %setup
 
 %build
-export CPPFLAGS=-I/usr/include/kerberos
-%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup}
+export CPPFLAGS="-I/usr/include/kerberos"
+%configure --with-tor-user="%{toruser}" --with-tor-group="%{torgroup}"
 %{__make} %{?_smp_mflags}
 %{__perl} -pi -e "s|# chkconfig: 2345|# chkconfig: -|g;" contrib/tor.sh
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
-%{__install} -D -m755 contrib/torctl %{buildroot}%{_bindir}/torctl
-%{__install} -D -m755 contrib/tor.sh %{buildroot}%{_initrddir}/tor
-%{__install} -D -m644 contrib/tor.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/tor
-%{__mv} %{buildroot}%{_sysconfdir}/tor/torrc.sample %{buildroot}%{_sysconfdir}/tor/torrc
-%{__install} -d %{buildroot}%{_localstatedir}/lib/tor %{buildroot}%{_localstatedir}/run/tor %{buildroot}%{_localstatedir}/log/tor
+%{__make} install DESTDIR="%{buildroot}"
+%{__install} -Dp -m755 contrib/torctl %{buildroot}%{_bindir}/torctl
+%{__install} -Dp -m755 contrib/tor.sh %{buildroot}%{_initrddir}/tor
+%{__install} -Dp -m644 contrib/tor.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/tor
+%{__mv} -f %{buildroot}%{_sysconfdir}/tor/torrc.sample %{buildroot}%{_sysconfdir}/tor/torrc
+%{__install} -d %{buildroot}%{_localstatedir}/lib/tor/
+%{__install} -d %{buildroot}%{_localstatedir}/run/tor/
+%{__install} -d %{buildroot}%{_localstatedir}/log/tor/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -68,7 +70,7 @@
 fi
 
 %postun
-/sbin/service tor condrestart > /dev/null 2>&1 || :
+/sbin/service tor condrestart &>/dev/null || :
 
 %files
 %defattr(-, root, root, 0755)
@@ -80,18 +82,25 @@
 %{_bindir}/torify
 %{_sysconfdir}/logrotate.d/tor
 %{_initrddir}/tor
+
 %defattr(-, root, %{torgroup}, 0750)
 %dir %{_sysconfdir}/tor/
+
 %defattr(-, root, %{torgroup}, 0640)
 %config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
 %config(noreplace) %{_sysconfdir}/tor/torrc
+
 %defattr(-, %{toruser}, %{torgroup}, 0700)
 %dir %{_localstatedir}/lib/tor
+
 %defattr(-, %{toruser}, %{torgroup}, 0750)
 %dir %{_localstatedir}/run/tor
 %dir %{_localstatedir}/log/tor
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1.1.26-2
+- Rebuild against libevent-1.3a.
+
 * Mon Dec 18 2006 Dries Verachtert <dries at ulyssis.org> - 0.1.1.26-1
 - Updated to release 0.1.1.26.
 

Modified: trunk/rpms/trickle/trickle.spec
===================================================================
--- trunk/rpms/trickle/trickle.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/trickle/trickle.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -1,26 +1,20 @@
 # $Id$
-
 # Authority: dag
+# Upstream: Marius Aamodt Eriksen <marius$monkey,org>
 
-# Upstream: marius aamodt eriksen <marius$monkey,org>
-
-### FIXME: Makefiles don't allow -jX (parallel compilation) with -j5
-# Distcc: 0
-
 ### FIXME: Create a proper sysv script for trickled based on the template.
 
 Summary: portable lightweight userspace bandwidth shaper
 Name: trickle
 Version: 1.06
-Release: 0.2
+Release: 1
 License: BSD
 Group: Applications/Internet
 URL: http://www.monkey.org/~marius/trickle/
 
-Source: http://www.monkey.org/~marius/trickle/%{name}-%{version}.tar.gz
+Source: http://www.monkey.org/~marius/trickle/trickle-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-
 BuildRequires: libevent-devel
 
 %description
@@ -43,7 +37,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,13 +45,17 @@
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE README TODO
-%doc %{_mandir}/man?/*
-%{_bindir}/*
+%doc %{_mandir}/man1/trickle.1*
+%doc %{_mandir}/man5/trickled.conf.5*
+%doc %{_mandir}/man8/trickled.8*
+%{_bindir}/trickle
+%{_bindir}/tricklectl
+%{_bindir}/trickled
 %{_libdir}/trickle/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.06-0.2
-- Rebuild for Fedora Core 5.
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.06-1
+- Rebuild against libevent-1.3a.
 
-* Tue Aug 05 2003 Dag Wieers <dag at wieers.com> - 1.06
+* Tue Aug 05 2003 Dag Wieers <dag at wieers.com> - 1.06-0
 - Initial package. (using DAR)

Added: trunk/rpms/ushare/ushare.spec
===================================================================
--- trunk/rpms/ushare/ushare.spec	                        (rev 0)
+++ trunk/rpms/ushare/ushare.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -0,0 +1,170 @@
+# $Id$
+# Authority: dag
+
+%define logmsg logger -t %{name}/rpm
+
+Summary: Universal Plug'nPlay (uPNP) Media Server
+Name: ushare
+Version: 0.9.8
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://ushare.geexbox.org/
+
+Source: http://ushare.geexbox.org/releases/ushare-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: libupnp-devel
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
+
+%description
+uShare is a UPnP (TM) A/V Media Server. It implements the server 
+component that provides UPnP media devices with information on 
+available multimedia files. uShare uses the built-in http server 
+of libupnp to stream the files to clients.
+
+%prep
+%setup
+
+%{__cat} <<'EOF' >ushare.sysv
+#!/bin/bash
+#
+# Init file for uShare UPnP Media Server
+#
+# Written by Dag Wieers <dag at wieers.com>
+#
+# chkconfig: - 54 46
+# description: uShare UPnP Media Server
+#
+# processname: dovecot
+# config: %{_sysconfdir}/dovecot.conf
+# pidfile: %{_localstatedir}/run/dovecot
+
+source %{_initrddir}/functions
+
+OPTIONS=""
+  
+[ -x %{_bindir}/ushare ] || exit 1
+[ -r "%{_sysconfdir}/ushare.conf" ] && source %{_sysconfdir}/ushare.conf
+[ -z "$USHARE_DIR" ] && exit 0
+
+RETVAL=0
+prog="ushare"
+desc="UPnP Media Server"
+
+start() {
+	echo -n $"Starting $desc ($prog): "
+	daemon --user ushare $prog -D $OPTIONS
+	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
+}
+
+restart() {
+	stop
+	start
+}
+
+reload() {
+	echo -n $"Reloading $desc ($prog): "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  reload)
+	reload
+	;;
+  condrestart)
+	[ -e %{_localstatedir}/lock/subsys/$prog ] && restart
+	RETVAL=$?
+	;;
+  status)
+	status $prog
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+	RETVAL=1
+esac
+
+exit $RETVAL
+EOF
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%{__install} -Dp -m0755 ushare.sysv %{buildroot}%{_initrddir}/ushare
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/ushare/
+%find_lang %{name}
+
+%pre
+if ! /usr/bin/id ushare &>/dev/null; then
+        /usr/sbin/useradd -r -M -d %{_localstatedir}/lib/ushare -s /sbin/nologin -c "ushare service accoung" ushare || \
+                %logmsg "Unexpected error adding user \"ushare\". Aborting installation."
+fi
+
+%post
+/sbin/chkconfig --add ushare
+
+%preun
+if [ $1 -eq 0 ]; then
+	/sbin/service ushare stop &>/dev/null || :
+	/sbin/chkconfig --del ushare
+fi
+
+%postun
+if [ $1 -eq 0 ]; then 
+        /usr/sbin/userdel ushare || %logmsg "User \"ushare\" could not be deleted."
+        /usr/sbin/groupdel ushare || %logmsg "Group \"ushare\" could not be deleted."
+fi
+if [ $1 -ge 1 ]; then
+	/sbin/service ushare condrestart &>/dev/null || :
+fi
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc %{_mandir}/man1/ushare.1*
+%config(noreplace) %{_sysconfdir}/ushare.conf
+%config %{_initrddir}/ushare
+%{_bindir}/ushare
+
+%defattr(-, ushare, ushare, 0770)
+%{_localstatedir}/lib/ushare/
+
+%exclude %{_sysconfdir}/init.d/ushare
+
+%changelog
+* Wed Feb 21 2007 Dag Wieers <dag at wieers.com> - 0.9.8-1
+- Initial package. (using DAR)


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

Modified: trunk/rpms/vomit/vomit.spec
===================================================================
--- trunk/rpms/vomit/vomit.spec	2007-02-20 20:23:32 UTC (rev 5187)
+++ trunk/rpms/vomit/vomit.spec	2007-02-21 00:19:18 UTC (rev 5188)
@@ -5,12 +5,13 @@
 %{?dist: %{expand: %%define %dist 1}}
 
 %{!?dist:%define _with_libpcapdevel 1}
+%{?fc7:%define _with_libpcapdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 Summary: Decodes VoIP audio from tcpdump captures
 Name: vomit
 Version: 0.2c
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://vomit.xtdnet.nl/
@@ -50,5 +51,8 @@
 %{_bindir}/vomit
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.2c-2
+- Rebuild against libevent-1.3a.
+
 * Sun Mar 05 2006 Dag Wieers <dag at wieers.com> - 0.2c-1
 - Initial package. (using DAR)

