[svn] r5225 - in trunk/rpms: adns apt arc arpd clamav convmv
deltarpm dynamite fbdump fragroute gaim-meanwhile icewm iogen
ladspa lftp libcaca libdnsres libevent libgksuui libotr
mailgraph meanwhile memcached mixxx mplayer novi nttlscan
packer packit rdesktop scanmem sharedance tcpstat tor trickle
vomit wxGTK xdx yum-metadata-parser
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Mar 9 22:50:57 CET 2007
Author: dag
Date: 2007-03-09 22:50:51 +0100 (Fri, 09 Mar 2007)
New Revision: 5225
Added:
trunk/rpms/apt/apt-test.spec
Modified:
trunk/rpms/adns/adns.spec
trunk/rpms/apt/apt.spec
trunk/rpms/arc/arc.spec
trunk/rpms/arpd/arpd.spec
trunk/rpms/clamav/clamav-milter.init
trunk/rpms/clamav/clamav.spec
trunk/rpms/convmv/convmv.spec
trunk/rpms/deltarpm/deltarpm.spec
trunk/rpms/dynamite/dynamite.spec
trunk/rpms/fbdump/fbdump.spec
trunk/rpms/fragroute/fragroute.spec
trunk/rpms/gaim-meanwhile/gaim-meanwhile.spec
trunk/rpms/icewm/icewm.spec
trunk/rpms/iogen/iogen.spec
trunk/rpms/ladspa/ladspa.spec
trunk/rpms/lftp/lftp.spec
trunk/rpms/libcaca/libcaca.spec
trunk/rpms/libdnsres/libdnsres.spec
trunk/rpms/libevent/libevent.spec
trunk/rpms/libgksuui/libgksuui.spec
trunk/rpms/libotr/libotr.spec
trunk/rpms/mailgraph/mailgraph.spec
trunk/rpms/meanwhile/meanwhile.spec
trunk/rpms/memcached/memcached-1.1.spec
trunk/rpms/memcached/memcached.spec
trunk/rpms/mixxx/mixxx.spec
trunk/rpms/mplayer/mplayer.spec
trunk/rpms/novi/novi.spec
trunk/rpms/nttlscan/nttlscan.spec
trunk/rpms/packer/packer.spec
trunk/rpms/packit/packit.spec
trunk/rpms/rdesktop/rdesktop.spec
trunk/rpms/scanmem/scanmem.spec
trunk/rpms/sharedance/sharedance.spec
trunk/rpms/tcpstat/tcpstat.spec
trunk/rpms/tor/tor.spec
trunk/rpms/trickle/trickle.spec
trunk/rpms/vomit/vomit.spec
trunk/rpms/wxGTK/wxGTK-2.6.spec
trunk/rpms/wxGTK/wxGTK.spec
trunk/rpms/xdx/xdx.spec
trunk/rpms/yum-metadata-parser/yum-metadata-parser.spec
Log:
Updates
Modified: trunk/rpms/adns/adns.spec
===================================================================
--- trunk/rpms/adns/adns.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/adns/adns.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -47,7 +47,6 @@
%{buildroot}%{_bindir} \
%{buildroot}%{_includedir}
%makeinstall
-#%{__make} install DESTDIR="%{buildroot}"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -65,6 +64,7 @@
%defattr(-, root, root, 0755)
%{_includedir}/adns.h
%{_libdir}/libadns.a
+%{_libdir}/libadns.so
%changelog
* Mon Aug 14 2006 Dag Wieers <dag at wieers.com> - 1.2-1
Added: trunk/rpms/apt/apt-test.spec
===================================================================
--- trunk/rpms/apt/apt-test.spec (rev 0)
+++ trunk/rpms/apt/apt-test.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -0,0 +1,329 @@
+# $Id$
+# Authority: dag
+# Upstream: Panu Matilainen <pmatilai$laiskiainen,org>
+
+# Tag: test
+
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?rh8:%define _without_elfutils 1}
+%{?rh7:%define _without_elfutils 1}
+
+%{?el2:%define _without_elfutils 1}
+%{?el2:%define _without_pkgconfig 1}
+
+%{?rh6:%define _without_elfutils 1}
+%{?rh6:%define _without_pkgconfig 1}
+
+%define LIBVER 3.3
+
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.90
+Release: 1
+License: GPL
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+
+Source: http://apt-rpm.org/testing/apt-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: rpm-devel >= 3.0.5, zlib-devel, gettext, ncurses-devel
+BuildRequires: readline-devel, bison, gcc-c++, libtool, libxml2-devel >= 2.6.16
+%{!?_without_pkgconfig:BuildRequires: pkgconfig >= 0.9}
+
+%{!?_without_elfutils:BuildRequires: beecrypt-devel, elfutils-devel}
+%{?_without_elfutils:BuildRequires: libelf}
+
+%{!?rh6:BuildRequires: bzip2-devel, libstdc++-devel, docbook-utils}
+%{?rh8:BuildRequires: libelf-devel}
+
+Requires: rpm >= 3.0.5, zlib, bzip2-libs, libstdc++
+Requires: libxml2 >= 2.6.16
+
+%description
+A port of Debian's apt tools for RPM based distributions, or at least
+originally for Conectiva and now Red Hat Linux. It provides the apt-get
+utility that provides a simpler, safer way to install and upgrade packages.
+APT features complete installation ordering, multiple source capability and
+several other unique features.
+
+%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 -n %{name}-%{version}
+
+%{?el5:name='Red Hat Enterprise'; version='5'}
+%{?el4:name='Red Hat Enterprise'; version='4'}
+%{?el3:name='Red Hat Enterprise'; version='3'}
+%{?el2:name='Red Hat Enterprise'; version='2.1'}
+%{?fc7:name='Fedora Core'; version='7'}
+%{?fc6:name='Fedora Core'; version='6'}
+%{?fc5:name='Fedora Core'; version='5'}
+%{?fc4:name='Fedora Core'; version='4'}
+%{?fc3:name='Fedora Core'; version='3'}
+%{?fc2:name='Fedora Core'; version='2'}
+%{?fc1:name='Fedora Core'; version='1'}
+%{?rh9:name='Red Hat'; version='9'}
+%{?rh8:name='Red Hat'; version='8.0'}
+%{?rh7:name='Red Hat'; version='7.3'}
+%{?rh6:name='Red Hat'; version='6.2'}
+
+%{__perl} -pi.orig -e 's|RPM APT-HTTP/1.3|RPMforge RPM Repository %{dist}/%{_arch} APT-HTTP/1.3|' methods/http.cc
+
+%{__cat} <<'EOF' >os.list
+# Name: Operating system and updates
+
+### Red Hat Enterprise Linux
+#repomd http://yam rhel$(VERSION)as-$(ARCH)/os
+#repomd http://yam rhel$(VERSION)as-$(ARCH)/updates
+#repomd http://mirror.centos.org centos/$(VERSION)/apt/os
+#repomd http://mirror.centos.org centos/$(VERSION)/apt/updates
+#rpm http://yam rhel$(VERSION)as-$(ARCH) os updates
+#rpm http://mirror.centos.org centos/$(VERSION)/apt os updates
+
+### Fedora Core Linux
+%{!?fedora:#}repomd http://ayo.freshrpms.net fedora/linux/$(VERSION)/$(ARCH)/core
+%{!?fedora:#}repomd http://ayo.freshrpms.net fedora/linux/$(VERSION)/$(ARCH)/updates
+#rpm http://ayo.freshrpms.net fedora/linux/$(VERSION)/$(ARCH) core updates
+
+### Red Hat Linux
+%{!?rhl:#}repomd http://ayo.freshrpms.net redhat/$(VERSION)/$(ARCH)/os
+%{!?rhl:#}repomd http://ayo.freshrpms.net redhat/$(VERSION)/$(ARCH)/updates
+#rpm http://ayo.freshrpms.net redhat/$(VERSION)/$(ARCH) os updates
+EOF
+
+%{__cat} <<EOF >apt.conf
+APT {
+ Clean-Installed "false";
+ Get {
+ Assume-Yes "false";
+ Download-Only "false";
+ Show-Upgraded "true";
+ Fix-Broken "false";
+ Ignore-Missing "false";
+ Compile "false";
+ };
+ DistroVersion "$version";
+};
+
+Acquire {
+ Retries "0";
+ HTTP {
+ Proxy ""; // http://user:pass@host:port/
+ };
+};
+
+RPM {
+ Ignore { };
+ Hold { };
+ Options { };
+ Install-Options "";
+ Erase-Options "";
+// Pre-Install-Pkgs { "/usr/bin/apt-sigchecker"; };
+ Source {
+ Build-Command "rpmbuild --rebuild";
+ };
+ Allow-Duplicated {
+ "^kernel$";
+ "^kernel-";
+ "^gpg-pubkey$";
+ };
+ Order "true";
+};
+EOF
+
+%build
+%{?_without_pkgconfig:export LIBXML2_CFLAGS="$(xml2-config --cflags)"}
+%{?_without_pkgconfig:export LIBXML2_LIBS="$(xml2-config --libs)"}
+%configure \
+ --program-prefix="%{?_program_prefix}" \
+ --includedir="%{_includedir}/apt-pkg"
+# --with-hashmap
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall \
+ includedir="%{buildroot}%{_includedir}/apt-pkg"
+%find_lang %{name}
+
+%{__install} -d -m0755 \
+ %{buildroot}%{_sysconfdir}/apt/{apt.conf.d,sources.list.d} \
+ %{buildroot}%{_localstatedir}/cache/apt/{archives/partial,genpkglist,gensrclist} \
+ %{buildroot}%{_localstatedir}/state/apt/lists/partial \
+ %{buildroot}%{_libdir}/apt/scripts/
+%{__install} -p -m0644 rpmpriorities apt.conf %{buildroot}%{_sysconfdir}/apt/
+%{__install} -p -m0644 os.list %{buildroot}%{_sysconfdir}/apt/sources.list.d/
+touch %{buildroot}%{_sysconfdir}/apt/preferences \
+ %{buildroot}%{_sysconfdir}/apt/vendors.list
+
+#%{__ln_s} -f %{_libdir}libapt-pkg-libc6.3-5.so.0 %{buildroot}%{_libdir}libapt-pkg-libc6.3-5.so.%{LIBVER}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS* COPYING* TODO contrib/ doc/examples/
+%doc %{_mandir}/man5/apt.conf.5*
+%doc %{_mandir}/man5/apt_preferences.5*
+%doc %{_mandir}/man5/sources.list.5*
+%doc %{_mandir}/man5/vendors.list.5*
+%doc %{_mandir}/man8/apt-cache.8*
+%doc %{_mandir}/man8/apt-cdrom.8*
+%doc %{_mandir}/man8/apt-config.8*
+%doc %{_mandir}/man8/apt-get.8*
+%doc %{_mandir}/man8/apt.8*
+%dir %{_sysconfdir}/apt/
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
+%config(noreplace) %{_sysconfdir}/apt/preferences
+#config(noreplace) %{_sysconfdir}/apt/sources.list
+%config(noreplace) %{_sysconfdir}/apt/vendors.list
+%config %{_sysconfdir}/apt/rpmpriorities
+%config(noreplace) %{_sysconfdir}/apt/apt.conf.d/
+%config(noreplace) %{_sysconfdir}/apt/sources.list.d/
+%{_bindir}/apt-cache
+%{_bindir}/apt-cdrom
+%{_bindir}/apt-config
+%{_bindir}/apt-get
+%{_bindir}/apt-shell
+%{_bindir}/genbasedir
+%{_bindir}/genpkglist
+%{_bindir}/gensrclist
+%{_bindir}/countpkglist
+%{_libdir}/apt/
+%{_libdir}/libapt-pkg-*.so.*
+%{_localstatedir}/cache/apt/
+%{_localstatedir}/state/apt/
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_libdir}/libapt-pkg.a
+%exclude %{_libdir}/libapt-pkg.la
+%{_libdir}/libapt-pkg.so
+%{_includedir}/apt-pkg/
+
+%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.90-1
+- Updated to release 0.5.15lorg3.90.
+
+* Fri Jun 23 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.2-1
+- Updated to release 0.5.15lorg3.2.
+
+* Sun Jun 04 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.1-4
+- Fixed APT::DistroVersion.
+
+* Sun Jun 04 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.1-3
+- Added APT::DistroVersion and RPM::Order to apt.conf.
+
+* Mon May 29 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.1-2
+- Fixed a segfault with the new createrepo -n output.
+
+* Tue May 23 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.1-1
+- Updated to 0.5.15lorg3.1.
+
+* Thu Apr 27 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3-3
+- Added patch to handle no-epoch on <= RH9.
+
+* Tue Apr 25 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3-2
+- Added patch to allow synaptic to build.
+
+* Mon Apr 24 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3-1
+- Updated to 0.5.15lorg3.
+
+* Tue Apr 11 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3-0.rc1
+- Updated to 0.5.15lorg3-rc1.
+
+* Sun Mar 05 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg2-0.20060301
+- Experimental version from Panu with repomd and multilib support.
+
+* Mon Jan 02 2005 Dries Verachtert <dries at ulyssis.org> - 0.5.15cnc7-1
+- Added libtoolize and autoreconf fix for Fedora Core 5, thanks
+ to Stephen Clement.
+- Updated to release 0.5.15cnc7.
+
+* Sat Nov 20 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc6-4
+- Added readline-devel as buildrequirement for apt-shell.
+
+* Thu Jul 01 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc6-3
+- Fix for apt-bug triggered by mach.
+
+* Fri Jun 04 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc6-2
+- Make apt understand about architectures.
+
+* Tue Mar 23 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc6-1
+- Updated to release 0.5.15cnc6.
+
+* Sat Jan 24 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc1-1
+- Added RHAS21 repository.
+
+* Sun Jan 04 2004 Dag Wieers <dag at wieers.com> - 0.5.15cnc5-0
+- Updated to release 0.5.15cnc5.
+
+* Sat Dec 06 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc4-1
+- Disabled the epoch promotion behaviour on RH9.
+
+* Thu Dec 04 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc4-0
+- Updated to release 0.5.15cnc4.
+
+* Tue Nov 25 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc3-0
+- Updated to release 0.5.15cnc3.
+
+* Mon Nov 10 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc2-0
+- Updated to release 0.5.15cnc2.
+
+* Mon Nov 10 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc1-1
+- Fixed apt pinning.
+- Added RHFC1 repository.
+
+* Sat Nov 08 2003 Dag Wieers <dag at wieers.com> - 0.5.15cnc1-0
+- Updated to release 0.5.15cnc1.
+
+* Sun Oct 26 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc6-1
+- Added RHEL3 repository.
+
+* Tue Jun 10 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc6-0
+- Added newrpms and enable it by default.
+- Updated to release 0.5.5cnc6.
+
+* Tue Jun 03 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc5-4
+- Added freshrpms and enable it by default.
+
+* Sun Jun 01 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc5-3
+- Work around a bug in apt (apt.conf).
+
+* Fri May 30 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc5-2
+- Moved sources.list to sources.d/
+
+* Wed Apr 16 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc5-1
+- Updated to release 0.5.5cnc5.
+
+* Tue Apr 08 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc4.1-2
+- RH90 repository rename from redhat/9.0 to redhat/9.
+
+* Sat Apr 05 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc4.1-1
+- FreshRPMS fixes to repository locations.
+
+* Sun Mar 09 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc4.1-0
+- Updated to release 0.5.5cnc4.1.
+
+* Fri Feb 28 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc3-0
+- Updated to release 0.5.5cnc3.
+
+* Tue Feb 25 2003 Dag Wieers <dag at wieers.com> - 0.5.5cnc2-0
+- Updated to release 0.5.5cnc2.
+
+* Mon Feb 10 2003 Dag Wieers <dag at wieers.com> - 0.5.4cnc9-0
+- Initial package. (using DAR)
Property changes on: trunk/rpms/apt/apt-test.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/apt/apt.spec
===================================================================
--- trunk/rpms/apt/apt.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/apt/apt.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -21,9 +21,9 @@
Release: 1
License: GPL
Group: System Environment/Base
-URL: http://apt-rpm.laiskiainen.org/
+URL: http://apt-rpm.org/
-Source: http://apt-rpm.laiskiainen.org/releases/apt-%{version}.tar.bz2
+Source: http://apt-rpm.org/releases/apt-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: rpm-devel >= 3.0.5, zlib-devel, gettext, ncurses-devel
@@ -59,9 +59,12 @@
%prep
%setup -n %{name}-%{version}
+%{?el5:name='Red Hat Enterprise'; version='5'}
%{?el4:name='Red Hat Enterprise'; version='4'}
%{?el3:name='Red Hat Enterprise'; version='3'}
%{?el2:name='Red Hat Enterprise'; version='2.1'}
+%{?fc7:name='Fedora Core'; version='7'}
+%{?fc6:name='Fedora Core'; version='6'}
%{?fc5:name='Fedora Core'; version='5'}
%{?fc4:name='Fedora Core'; version='4'}
%{?fc3:name='Fedora Core'; version='3'}
@@ -172,7 +175,15 @@
%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS* COPYING* TODO contrib/ doc/examples/
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man5/apt.conf.5*
+%doc %{_mandir}/man5/apt_preferences.5*
+%doc %{_mandir}/man5/sources.list.5*
+%doc %{_mandir}/man5/vendors.list.5*
+%doc %{_mandir}/man8/apt-cache.8*
+%doc %{_mandir}/man8/apt-cdrom.8*
+%doc %{_mandir}/man8/apt-config.8*
+%doc %{_mandir}/man8/apt-get.8*
+%doc %{_mandir}/man8/apt.8*
%dir %{_sysconfdir}/apt/
%config(noreplace) %{_sysconfdir}/apt/apt.conf
%config(noreplace) %{_sysconfdir}/apt/preferences
@@ -201,7 +212,6 @@
%exclude %{_libdir}/libapt-pkg.la
%{_libdir}/libapt-pkg.so
%{_includedir}/apt-pkg/
-#exclude %{_libdir}/*.la
%changelog
* Fri Jun 23 2006 Dag Wieers <dag at wieers.com> - 0.5.15lorg3.2-1
Modified: trunk/rpms/arc/arc.spec
===================================================================
--- trunk/rpms/arc/arc.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/arc/arc.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -27,7 +27,7 @@
%{__install} -Dp -m0755 arc %{buildroot}%{_bindir}/arc
%{__install} -Dp -m0755 marc %{buildroot}%{_bindir}/marc
%{__install} -Dp -m0644 arc.1 %{buildroot}%{_mandir}/man1/arc.1
-%{__install} -Dp -m0644 marc.1 %{buildroot}%{_mandir}/man1/marc.1
+#%{__install} -Dp -m0644 marc.1 %{buildroot}%{_mandir}/man1/marc.1
%clean
%{__rm} -rf %{buildroot}
@@ -36,7 +36,7 @@
%defattr(-, root, root, 0755)
%doc Arc521.doc Arcinfo Changelog COPYING LICENSE Readme
%doc %{_mandir}/man1/arc.1*
-%doc %{_mandir}/man1/marc.1*
+#%doc %{_mandir}/man1/marc.1*
%{_bindir}/arc
%{_bindir}/marc
Modified: trunk/rpms/arpd/arpd.spec
===================================================================
--- trunk/rpms/arpd/arpd.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/arpd/arpd.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -11,7 +11,7 @@
Summary: ARP reply daemon
Name: arpd
Version: 0.2
-Release: 3
+Release: 4
License: OpenSource
Group: Applications/Internet
URL: http://www.honeyd.org/tools.php
@@ -53,6 +53,9 @@
%{_sbindir}/arpd
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.2-4
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.2-3
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/clamav/clamav-milter.init
===================================================================
--- trunk/rpms/clamav/clamav-milter.init 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/clamav/clamav-milter.init 2007-03-09 21:50:51 UTC (rev 5225)
@@ -25,7 +25,7 @@
case "$1" in
start)
echo -n "Starting Clamav Milter Daemon: "
- daemon clamav-milter ${CLAMAV_FLAGS}
+ daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter
Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/clamav/clamav.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -11,7 +11,7 @@
Summary: Anti-virus software
Name: clamav
Version: 0.90.1
-Release: 1
+Release: 4
License: GPL
Group: Applications/System
URL: http://www.clamav.net/
@@ -64,7 +64,8 @@
%package db
Summary: Virus database for %{name}
Group: Applications/Databases
-Requires: clamav = %{version}-%{release}
+### Remove circular dependency
+#Requires: clamav = %{version}-%{release}
### Fedora Extras introduced them differently :(
Obsoletes: clamav-update <= %{version}-%{release}
@@ -188,13 +189,14 @@
CLAMAV_FLAGS="
--config-file=%{_sysconfdir}/clamd.conf
+ --force-scan
+ --local
--max-children=10
- --force-scan
+ --noreject
+ --outgoing
--quiet
- --dont-log-clean
- --noreject
- -obl local:%{_localstatedir}/clamav/clmilter.socket
"
+SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket"
EOF
%build
@@ -234,7 +236,7 @@
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/
%post
-/sbin/ldconfig 2>/dev/null
+/sbin/ldconfig
ZONES="/usr/share/zoneinfo/zone.tab"
CONFIG="/etc/sysconfig/clock"
@@ -253,7 +255,6 @@
s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|;
' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || :
-%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%pre -n clamd
@@ -356,6 +357,16 @@
%{_libdir}/pkgconfig/libclamav.pc
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 0.90.1-4
+- Removed circular dependency.
+
+* Thu Mar 08 2007 Dag Wieers <dag at wieers.com> - 0.90.1-3
+- Cleaned up default options to clamav-milter. (Adam T. Bowen)
+- Removed -b/--bounce as it is no longer recognized.
+
+* Mon Mar 05 2007 Dag Wieers <dag at wieers.com> - 0.90.1-2
+- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl)
+
* Fri Mar 02 2007 Dag Wieers <dag at wieers.com> - 0.90.1-1
- Updated to release 0.90.1.
Modified: trunk/rpms/convmv/convmv.spec
===================================================================
--- trunk/rpms/convmv/convmv.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/convmv/convmv.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,9 +5,9 @@
Summary: Convert filenames to a different encoding
Name: convmv
Version: 1.10
-Release: 1
+Release: 2
License: GPL
-Group: Applications/Utilities
+Group: Applications/File
URL: http://j3e.de/linux/convmv/
Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
@@ -40,7 +40,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall DESTDIR=%{buildroot} PREFIX=%{_prefix}
+%makeinstall DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
%clean
%{__rm} -rf %{buildroot}
@@ -48,9 +48,12 @@
%files
%defattr(-, root, root, 0755)
%doc Changes CREDITS TODO
-%doc %{_mandir}/man1/convmv*
+%doc %{_mandir}/man1/convmv.1*
%{_bindir}/convmv
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 1.10-2
+- Fixed group.
+
* Tue Aug 15 2006 Dries Verachtert <dries at ulyssis.org> - 1.10-1
- Initial package.
Modified: trunk/rpms/deltarpm/deltarpm.spec
===================================================================
--- trunk/rpms/deltarpm/deltarpm.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/deltarpm/deltarpm.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,15 +4,15 @@
Summary: Create deltas between rpms
Name: deltarpm
Version: 3.3
-Release: 1.2
+Release: 2
License: BSD
-Group: Applications/Utilities
+Group: Applications/System
URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
-Source: ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-3.3.tar.bz2
+Source: ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bzip2-devel
+BuildRequires: bzip2-devel, rpm-devel >= 4.2
%description
A deltarpm contains the difference between an old
@@ -25,11 +25,11 @@
%setup
%build
-%{__make} %{?_smp_mflags} bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+%{__make} %{?_smp_mflags} prefix="%{_prefix}" mandir="%{_mandir}"
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}" prefix="%{_prefix}" mandir="%{_mandir}"
%clean
%{__rm} -rf %{buildroot}
@@ -37,7 +37,12 @@
%files
%defattr(-, root, root, 0755)
%doc LICENSE.BSD README
-%doc %{_mandir}/man8/*
+%doc %{_mandir}/man8/applydeltaiso.8*
+%doc %{_mandir}/man8/applydeltarpm.8*
+%doc %{_mandir}/man8/combinedeltarpm.8*
+%doc %{_mandir}/man8/drpmsync.8*
+%doc %{_mandir}/man8/makedeltaiso.8*
+%doc %{_mandir}/man8/makedeltarpm.8*
%{_bindir}/applydeltaiso
%{_bindir}/applydeltarpm
%{_bindir}/combinedeltarpm
@@ -47,8 +52,8 @@
%{_bindir}/rpmdumpheader
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 3.3-1.2
-- Rebuild for Fedora Core 5.
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 3.3-2
+- Fixed group.
* Sat Dec 03 2005 Dries Verachtert <dries at ulyssis.org> - 3.3-1
- Initial package.
Modified: trunk/rpms/dynamite/dynamite.spec
===================================================================
--- trunk/rpms/dynamite/dynamite.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/dynamite/dynamite.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,9 +4,9 @@
Summary: Extract data compressed with PKWARE Data Compression Library
Name: dynamite
Version: 0.1
-Release: 1
+Release: 2
License: MIT
-Group: Applications/Archivers
+Group: Applications/Archiving
URL: http://www.synce.org/index.php/Dynamite
Source: http://dl.sf.net/synce/dynamite-%{version}.tar.gz
@@ -61,5 +61,8 @@
%{_libdir}/libdynamite.so
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 0.1-2
+- Fixed group.
+
* Wed Feb 14 2007 Dag Wieers <dag at wieers.com> - 0.1-1
- Initial package. (using DAR)
Modified: trunk/rpms/fbdump/fbdump.spec
===================================================================
--- trunk/rpms/fbdump/fbdump.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/fbdump/fbdump.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,9 +5,9 @@
Summary: Take screenshots using the framebuffer device
Name: fbdump
Version: 0.4.2
-Release: 1
+Release: 2
License: GPL
-Group: Applications/Graphics
+Group: Amusements/Graphics
URL: http://www.rcdrummond.net/fbdump/
Source: http://www.rcdrummond.net/fbdump/fbdump-%{version}.tar.gz
@@ -40,5 +40,8 @@
%{_bindir}/fbdump
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 0.4.2-2
+- Fixed group.
+
* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 0.4.2-1
- Initial package. (using DAR)
Modified: trunk/rpms/fragroute/fragroute.spec
===================================================================
--- trunk/rpms/fragroute/fragroute.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/fragroute/fragroute.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -12,7 +12,7 @@
Summary: Intercepts, modifies, and rewrites egress traffic
Name: fragroute
Version: 1.2
-Release: 2
+Release: 3
License: BSD
Group: Applications/Internet
URL: http://www.monkey.org/~dugsong/fragroute/
@@ -53,6 +53,9 @@
%{_sbindir}/fragtest
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 1.2-3
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.2-2
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/gaim-meanwhile/gaim-meanwhile.spec
===================================================================
--- trunk/rpms/gaim-meanwhile/gaim-meanwhile.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/gaim-meanwhile/gaim-meanwhile.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,8 +4,8 @@
Summary: Lotus Sametime Community Client plugin for Gaim
Name: gaim-meanwhile
-Version: 1.2.5
-Release: 1.2
+Version: 1.2.8
+Release: 1
License: GPL
Group: Applications/Internet
URL: http://meanwhile.sourceforge.net/
@@ -29,7 +29,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%clean
%{__rm} -rf %{buildroot}
@@ -43,8 +43,8 @@
%{_datadir}/pixmaps/gaim/
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.5-1.2
-- Rebuild for Fedora Core 5.
+* Sun Mar 05 2007 Dag Wieers <dag at wieers.com> - 1.2.8-1
+- Updated to release 1.2.8.
* Sun Nov 27 2005 Dag Wieers <dag at wieers.com> - 1.2.5-1
- Updated to release 1.2.5.
Modified: trunk/rpms/icewm/icewm.spec
===================================================================
--- trunk/rpms/icewm/icewm.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/icewm/icewm.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -6,14 +6,11 @@
%{?dist: %{expand: %%define %dist 1}}
-%{?fc1:%define _without_xorg 1}
-%{?el3:%define _without_xorg 1}
-%{?rh9:%define _without_xorg 1}
-%{?rh8:%define _without_xorg 1}
-%{?rh7:%define _without_xorg 1}
-%{?el2:%define _without_xorg 1}
-%{?rh6:%define _without_xorg 1}
-%{?yd3:%define _without_xorg 1}
+%{!?dist:%define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
%{?rh7:%define _without_gnome2 1}
%{?el2:%define _without_gnome2 1}
@@ -21,7 +18,7 @@
Summary: Fast and small X11 window manager
Name: icewm
-Version: 1.2.26
+Version: 1.2.30
Release: 1
License: LGPL
Group: User Interface/Desktops
@@ -34,8 +31,8 @@
BuildRequires: imlib-devel, libpng-devel, kdelibs
BuildRequires: gcc-c++, gettext
%{!?_without_gnome2:BuildRequires: gnome-desktop-devel}
-%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-font-utils}
-%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-font-utils}
+%{!?_with_modxorg:BuildRequires: XFree86-devel, XFree86-font-utils}
+%{?_with_modxorg:BuildRequires: xorg-x11-devel, xorg-x11-font-utils}
Obsoletes: icewm-common <= %{version}
Obsoletes: icewm-l10n <= %{version}
Obsoletes: icewm-menu-gnome2 <= %{version}
@@ -95,6 +92,9 @@
%{_datadir}/icewm/
%changelog
+* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 1.2.30-1
+- Updated to release 1.2.30.
+
* Mon Apr 17 2006 Dag Wieers <dag at wieers.com> - 1.2.26-1
- Updated to release 1.2.26.
Modified: trunk/rpms/iogen/iogen.spec
===================================================================
--- trunk/rpms/iogen/iogen.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/iogen/iogen.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,9 +5,9 @@
Summary: I/O generator
Name: iogen
Version: 2.2
-Release: 1
+Release: 2
License: GPL
-Group: Applications/
+Group: Applications/System
URL: http://www.peereboom.us/iogen/
Source: http://www.peereboom.us/iogen/iogen_%{version}.tgz
@@ -48,5 +48,8 @@
%{_bindir}/iogen
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 2.2-2
+- Fixed group.
+
* Sun Feb 11 2007 Dag Wieers <dag at wieers.com> - 2.2-1
- Initial package. (using DAR)
Modified: trunk/rpms/ladspa/ladspa.spec
===================================================================
--- trunk/rpms/ladspa/ladspa.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/ladspa/ladspa.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -10,8 +10,11 @@
License: LGPL
Group: System Environment/Libraries
URL: http://www.ladspa.org/
+
Source: http://www.ladspa.org/download/ladspa_sdk_%{version}.tgz
+Patch: ladspa-1.12-gcc41.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
BuildRequires: gcc-c++
Obsoletes: ladspa-sdk <= 1.12
@@ -35,6 +38,8 @@
%prep
%setup -n %{real_name}
+%patch -p1
+
### FIXME: Correct URLs to link to local file. (Please fix upstream)
%{__perl} -pi -e 's|HREF="ladspa.h.txt"|HREF="file:///usr/include/ladspa.h"|' doc/*.html
Modified: trunk/rpms/lftp/lftp.spec
===================================================================
--- trunk/rpms/lftp/lftp.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/lftp/lftp.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -57,9 +57,9 @@
%{_datadir}/lftp/
%{_libdir}/lftp/
%exclude %{_libdir}/liblftp-jobs.la
-%{_libdir}/liblftp-jobs.so.*
+%{_libdir}/liblftp-jobs.so*
%exclude %{_libdir}/liblftp-tasks.la
-%{_libdir}/liblftp-tasks.so.*
+%{_libdir}/liblftp-tasks.so*
%changelog
* Fri Jan 26 2007 Dag Wieers <dag at wieers.com> - 3.5.9-1
Modified: trunk/rpms/libcaca/libcaca.spec
===================================================================
--- trunk/rpms/libcaca/libcaca.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/libcaca/libcaca.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -2,6 +2,12 @@
# Authority: matthias
# Upstream: Sam Hocevar <sam$zoy,org>
+%{!?dist:%define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
+
Summary: Library for Colour AsCii Art, text mode graphics
Name: libcaca
Version: 0.9
@@ -12,8 +18,10 @@
Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
Patch: libcaca-0.9-man3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: XFree86-devel, ncurses-devel >= 5, slang-devel, imlib2-devel
-Buildrequires: zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: ncurses-devel >= 5, slang-devel
+BuildRequires: imlib2-devel, zlib-devel, doxygen, tetex-latex, tetex-dvips
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
+%{?_with_modxorg:BuildRequires: libX11-devel, libXt-devel}
%description
libcaca is the Colour AsCii Art library. It provides high level functions
@@ -24,7 +32,8 @@
%package devel
Summary: Development files for libcaca, the library for Colour AsCii Art
Group: Development/Libraries
-Requires: XFree86-devel, ncurses-devel >= 5, slang-devel
+Requires: ncurses-devel >= 5, slang-devel
+%{!?_with_modxorg:Requires: XFree86-devel}
%description devel
libcaca is the Colour AsCii Art library. It provides high level functions
@@ -63,16 +72,19 @@
%build
%configure \
--program-prefix="%{?_program_prefix}" \
+ --x-includes="%{_includedir}" \
+ --x-libraries="%{_libdir}" \
+ --enable-imlib2 \
+ --enable-ncurses \
--enable-slang \
- --enable-ncurses \
- --enable-x11 \
- --enable-imlib2
+ --enable-x11
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
+
# We want to include the docs ourselves from the source directory
%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
Modified: trunk/rpms/libdnsres/libdnsres.spec
===================================================================
--- trunk/rpms/libdnsres/libdnsres.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/libdnsres/libdnsres.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -6,7 +6,7 @@
Summary: Non-blocking DNS resolver library
Name: libdnsres
Version: 0.1a
-Release: 2
+Release: 3
License: BSD-like
Group: System Environment/Libraries
URL: http://www.monkey.org/~provos/libdnsres/
@@ -60,8 +60,11 @@
%{_libdir}/libdnsres.so
%changelog
-* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1a-2
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.2-4
- Rebuild against libevent-1.3b.
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1a-2
+- Rebuild against libevent-1.3a.
+
* 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-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/libevent/libevent.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,7 +4,7 @@
Summary: Abstract asynchronous event notification library
Name: libevent
-Version: 1.3a
+Version: 1.3b
Release: 1
License: BSD
Group: System Environment/Libraries
@@ -65,10 +65,13 @@
%{_includedir}/event.h
%{_includedir}/evhttp.h
%{_libdir}/libevent.a
+%exclude %{_libdir}/libevent.la
%{_libdir}/libevent.so
-%exclude %{_libdir}/libevent.la
%changelog
+* Mon Mar 05 2007 Dag Wieers <dag at wieers.com> - 1.3b-1
+- Updated to release 1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.3a-1
- Updated to release 1.3a.
Modified: trunk/rpms/libgksuui/libgksuui.spec
===================================================================
--- trunk/rpms/libgksuui/libgksuui.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/libgksuui/libgksuui.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,9 +4,9 @@
Summary: Shows dialogs for asking passwords
Name: libgksuui
Version: 1.0.7
-Release: 1.2
+Release: 2
License: GPL
-Group: Applications/Utilities
+Group: Applications/Productivity
URL: http://savannah.nongnu.org/projects/gksu/
Source: http://people.debian.org/~kov/gksu/libgksuui1.0/libgksuui1.0-%{version}.tar.gz
@@ -65,8 +65,8 @@
%{_libdir}/pkgconfig/libgksuui*.pc
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.0.7-1.2
-- Rebuild for Fedora Core 5.
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 1.0.7-2
+- Fixed group.
* Thu Jan 05 2006 Dries Verachtert <dries at ulyssis.org> - 1.0.7-1
- Initial package.
Modified: trunk/rpms/libotr/libotr.spec
===================================================================
--- trunk/rpms/libotr/libotr.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/libotr/libotr.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -56,6 +56,7 @@
%doc AUTHORS ChangeLog COPYING* NEWS README
%doc %{_mandir}/man1/otr_mackey.1*
%doc %{_mandir}/man1/otr_modify.1*
+%doc %{_mandir}/man1/otr_parse.1*
%doc %{_mandir}/man1/otr_readforge.1*
%doc %{_mandir}/man1/otr_remac.1*
%doc %{_mandir}/man1/otr_sesskeys.1*
Modified: trunk/rpms/mailgraph/mailgraph.spec
===================================================================
--- trunk/rpms/mailgraph/mailgraph.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/mailgraph/mailgraph.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -52,7 +52,7 @@
%doc CHANGES COPYING README
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mailgraph.conf.example
%config(noreplace) %{_sysconfdir}/sysconfig/mailgraph
-%config %{_initrddir/mailgraph
+%config %{_initrddir}/mailgraph
%{_libdir}/mailgraph/
%{_localstatedir}/lib/mailgraph/img/
%{_localstatedir}/lib/mailgraph/rrd/
Modified: trunk/rpms/meanwhile/meanwhile.spec
===================================================================
--- trunk/rpms/meanwhile/meanwhile.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/meanwhile/meanwhile.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,8 +4,8 @@
Summary: Lotus Sametime Community Client library
Name: meanwhile
-Version: 0.5.0
-Release: 1.2
+Version: 1.0.2
+Release: 1
License: LGPL
Group: Applications/Internet
URL: http://meanwhile.sourceforge.net/
@@ -42,18 +42,15 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%{__mv} %{buildroot}%{_datadir}/doc/meanwhile-doc-%{version} rpmdoc
%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)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README rpmdoc/* TODO
@@ -68,8 +65,8 @@
%{_libdir}/pkgconfig/meanwhile.pc
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1.2
-- Rebuild for Fedora Core 5.
+* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 1.0.2-1
+- Updated to release 1.0.2.
* Fri Nov 11 2005 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1
- Updated to release 0.5.0.
Modified: trunk/rpms/memcached/memcached-1.1.spec
===================================================================
--- trunk/rpms/memcached/memcached-1.1.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/memcached/memcached-1.1.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,7 +5,7 @@
Summary: Distributed memory object caching system
Name: memcached
Version: 1.1.13
-Release: 3
+Release: 4
License: BSD
Group: System Environment/Daemons
URL: http://www.danga.com/memcached/
@@ -165,6 +165,9 @@
%{_bindir}/memcached-debug
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 1.1.13-4
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.1.13-3
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/memcached/memcached.spec
===================================================================
--- trunk/rpms/memcached/memcached.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/memcached/memcached.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,7 +5,7 @@
Summary: Distributed memory object caching system
Name: memcached
Version: 1.2.1
-Release: 2
+Release: 3
License: BSD
Group: System Environment/Daemons
URL: http://www.danga.com/memcached/
@@ -165,6 +165,9 @@
%{_bindir}/memcached-debug
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 1.2.1-3
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.2.1-2
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/mixxx/mixxx.spec
===================================================================
--- trunk/rpms/mixxx/mixxx.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/mixxx/mixxx.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -20,8 +20,8 @@
Summary: DJ software emulating an analog mixer with two playback devices
Name: mixxx
-Version: 1.4.2
-Release: 4
+Version: 1.5.0
+Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://mixxx.sourceforge.net/
@@ -112,6 +112,9 @@
%changelog
+* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 1.5.0-1
+- Updated to release 1.5.0.
+
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.4.2-4
- Release bump to drop the disttag number in FC5 build.
Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/mplayer/mplayer.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -9,6 +9,7 @@
%{?fc6: %define _with_modxorg 1}
%{?fc5: %define _with_modxorg 1}
+%{?el5:%define _without_nas 1}
%{?el4:%define _without_nas 1}
%{?fc3:%define _without_nas 1}
%{?fc2:%define _without_nas 1}
Modified: trunk/rpms/novi/novi.spec
===================================================================
--- trunk/rpms/novi/novi.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/novi/novi.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,9 +4,9 @@
Summary: Find the latest rpms by version in a tree
Name: novi
Version: 1.1.5
-Release: 1
+Release: 2
License: Apache License 2.0
-Group: Applications/Utilities
+Group: Applications/System
URL: http://www.exmachinatech.net/01/novi/
Source: http://downloads.exmachinatech.net/novi/%{version}/novi-%{version}.tar.bz2
@@ -30,17 +30,21 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall INSTALL_BIN_DIR=%{buildroot}%{_bindir} INSTALL_BASE=%{buildroot}%{_prefix} INSTALL_MAN_DIR=%{buildroot}%{_mandir} INSTALL_MAN1_DIR=%{buildroot}%{_mandir}/man1
+%{__make} install ALT_ROOT_DIR="%{buildroot}" INSTALL_MAN_DIR="%{buildroot}%{_mandir}"
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
-%doc *.TXT doc/*.html
-%doc %{_mandir}/man1/novi*
+%doc LICENSE* *.TXT doc/*.html
+%doc %{_mandir}/man1/novi.1*
+%doc %{_mandir}/man1/novi_examples.1*
%{_bindir}/novi
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 1.1.5-2
+- Fixed group.
+
* Sat May 20 2006 Dries Verachtert <dries at ulyssis.org> - 1.1.5-1
- Initial package.
Modified: trunk/rpms/nttlscan/nttlscan.spec
===================================================================
--- trunk/rpms/nttlscan/nttlscan.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/nttlscan/nttlscan.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -12,7 +12,7 @@
Summary: Quick network topology scanner
Name: nttlscan
Version: 0.1
-Release: 2
+Release: 3
License: GPL
Group: Applications/Internet
URL: http://www.honeyd.org/tools.php
@@ -50,6 +50,9 @@
%{_bindir}/nttlscan
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.1-3
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1-2
- Rebuild against libevent-1.3a.
- Added missing BuildRequires. (Robert Hardy)
Modified: trunk/rpms/packer/packer.spec
===================================================================
--- trunk/rpms/packer/packer.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/packer/packer.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,10 +5,10 @@
Summary: Tool that helps in the creation of packages
Name: packer
Version: 0.1.5
-Release: 1.2
+Release: 2
License: GPL
-Group: Applications/Utilities
-URL: http://packer.sourceforge.net
+Group: Applications/System
+URL: http://packer.sourceforge.net/
Source: http://dl.sf.net/packer/packer-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -27,29 +27,30 @@
%setup
%build
-#configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall DESTDIR=%{buildroot}
-%{__mv} %{buildroot}%{_datadir}/doc/packer packerrpmdocs
+%{__make} install DESTDIR=%{buildroot}
+%{__mv} %{buildroot}%{_datadir}/doc/packer rpm-doc
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
-%doc COPYING packerrpmdocs/*
-%doc %{_mandir}/man1/*
+%doc COPYING rpm-doc/*
+%doc %{_mandir}/man1/desktop2menu.1*
+%doc %{_mandir}/man1/differ.1*
+%doc %{_mandir}/man1/packer.1*
%{_bindir}/desktop2menu
%{_bindir}/differ
%{_bindir}/packer
%{_datadir}/packer/
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.1.5-1.2
-- Rebuild for Fedora Core 5.
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 0.1.5-2
+- Fixed group.
* Sun Feb 19 2006 Dries Verachtert <dries at ulyssis.org> - 0.1.5-1
- Updated to release 0.1.5.
Modified: trunk/rpms/packit/packit.spec
===================================================================
--- trunk/rpms/packit/packit.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/packit/packit.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -8,6 +8,12 @@
%{?el5:%define _with_libpcapdevel 1}
%{?fc6:%define _with_libpcapdevel 1}
+%{?fc1:%define _without_pcapbpf_h 1}
+%{?el3:%define _without_pcapbpf_h 1}
+%{?rh9:%define _without_pcapbpf_h 1}
+%{?rh7:%define _without_pcapbpf_h 1}
+%{?el2:%define _without_pcapbpf_h 1}
+
Summary: Network injection and capturing tool
Name: packit
Version: 1.0
@@ -34,9 +40,7 @@
%prep
%setup
-%{?el4:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
-%{?fc3:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
-%{?fc2:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
+%{!?_without_pcapbpf_h:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
%build
%configure
Modified: trunk/rpms/rdesktop/rdesktop.spec
===================================================================
--- trunk/rpms/rdesktop/rdesktop.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/rdesktop/rdesktop.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -2,8 +2,17 @@
# Authority: dag
### Ships with Fedora Core / Red Hat Enterprise
-# Tag: test
+##Tag: test
+# Rationale: We replace the RHEL version as it fixes a transparancy bug with compiz
+%{?dist: %{expand: %%define %dist 1}}
+
+%{!?dist:%define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
+
Summary: X client for remote desktop into Windows Terminal Server
Name: rdesktop
Version: 1.5.0
@@ -15,7 +24,9 @@
Source: http://dl.sf.net/rdesktop/rdesktop-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: openssl-devel, XFree86-devel
+BuildRequires: openssl-devel
+%{?_with_modxorg:BuildRequires: libXt-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
%description
rdesktop is an open source client for Windows NT Terminal Server and
Modified: trunk/rpms/scanmem/scanmem.spec
===================================================================
--- trunk/rpms/scanmem/scanmem.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/scanmem/scanmem.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,7 +4,7 @@
Summary: Simple interactive debugging utility
Name: scanmem
-Version: 0.04
+Version: 0.05
Release: 1
License: GPL
Group: Development/Debuggers
@@ -41,5 +41,8 @@
%{_bindir}/scanmem
%changelog
+* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 0.05-1
+- Updated to release 0.05.
+
* Tue Jan 30 2007 Dag Wieers <dag at wieers.com> - 0.04-1
- Initial package. (using DAR)
Modified: trunk/rpms/sharedance/sharedance.spec
===================================================================
--- trunk/rpms/sharedance/sharedance.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/sharedance/sharedance.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,7 +4,7 @@
Summary: Ephemeral key/data pair storing daemon
Name: sharedance
Version: 0.6
-Release: 2
+Release: 3
License: GPL
Group: System Environment/Daemons
URL: http://sharedance.pureftpd.org/
@@ -86,6 +86,9 @@
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.6-3
+- Rebuild against libevent-1.3b.
+
* Fri Jan 12 2007 Matthias Saou <http://freshrpms.net/> 0.6-2
- Initial RPM release.
Modified: trunk/rpms/tcpstat/tcpstat.spec
===================================================================
--- trunk/rpms/tcpstat/tcpstat.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/tcpstat/tcpstat.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -4,9 +4,9 @@
Summary: Reports certain network interface statistics
Name: tcpstat
Version: 1.5
-Release: 1
+Release: 2
License: NSD
-Group: System Environment/Tools
+Group: Applications/Internet
URL: http://www.frenchfries.net/paul/tcpstat/
Source: http://www.frenchfries.net/paul/tcpstat/tcpstat-%{version}.tar.gz
@@ -41,5 +41,8 @@
%{__rm} -rf %{buildroot}
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 1.5-2
+- Fixed group.
+
* Thu Feb 22 2007 Dag Wieers <dag at wieers.com> - 1.5-1
- Initial package. (using DAR)
Modified: trunk/rpms/tor/tor.spec
===================================================================
--- trunk/rpms/tor/tor.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/tor/tor.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -9,7 +9,7 @@
Summary: Send network traffic through virtual tunnels to improve your privacy
Name: tor
Version: 0.1.1.26
-Release: 2
+Release: 3
License: BSD
Group: Applications/Internet
URL: http://tor.eff.org/
@@ -98,6 +98,9 @@
%dir %{_localstatedir}/log/tor
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.1.1.26-3
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.1.1.26-2
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/trickle/trickle.spec
===================================================================
--- trunk/rpms/trickle/trickle.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/trickle/trickle.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -7,7 +7,7 @@
Summary: portable lightweight userspace bandwidth shaper
Name: trickle
Version: 1.06
-Release: 1
+Release: 2
License: BSD
Group: Applications/Internet
URL: http://www.monkey.org/~marius/trickle/
@@ -54,6 +54,9 @@
%{_libdir}/trickle/
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 1.06-2
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.06-1
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/vomit/vomit.spec
===================================================================
--- trunk/rpms/vomit/vomit.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/vomit/vomit.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -12,7 +12,7 @@
Summary: Decodes VoIP audio from tcpdump captures
Name: vomit
Version: 0.2c
-Release: 2
+Release: 3
License: GPL
Group: Applications/Internet
URL: http://vomit.xtdnet.nl/
@@ -52,6 +52,9 @@
%{_bindir}/vomit
%changelog
+* Wed Mar 07 2007 Dag Wieers <dag at wieers.com> - 0.2c-3
+- Rebuild against libevent-1.3b.
+
* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.2c-2
- Rebuild against libevent-1.3a.
Modified: trunk/rpms/wxGTK/wxGTK-2.6.spec
===================================================================
--- trunk/rpms/wxGTK/wxGTK-2.6.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/wxGTK/wxGTK-2.6.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -101,6 +101,7 @@
%files devel
%defattr(-, root, root, 0755)
%{_bindir}/wx-config
+%{_bindir}/wxrc
%{_bindir}/wxrc-2.6
%{_datadir}/aclocal/*.m4
%dir %{_datadir}/bakefile/
Modified: trunk/rpms/wxGTK/wxGTK.spec
===================================================================
--- trunk/rpms/wxGTK/wxGTK.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/wxGTK/wxGTK.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -81,7 +81,7 @@
%{__make} install DESTDIR="%{buildroot}" -C contrib/src/svg
%find_lang wxstd
%find_lang wxmsw
-%{__cat} wxstd.lang wxmsw.lang >>wx.lang
+#{__cat} wxstd.lang wxmsw.lang >>wx.lang
### Overwrite wrong symlink (includes buildroot)
%{__ln_s} -f ../%{_lib}/wx/config/gtk2-ansi-release-2.6 %{buildroot}%{_bindir}/wx-config
Modified: trunk/rpms/xdx/xdx.spec
===================================================================
--- trunk/rpms/xdx/xdx.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/xdx/xdx.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -5,9 +5,9 @@
Summary: Client to connect to a DX-cluster for amateur radio
Name: xdx
Version: 2.2
-Release: 1
+Release: 2
License: GPL
-Group: Applications/Utilities
+Group: Applications/Communications
URL: http://www.qsl.net/pg4i/linux/xdx.html
Source: http://www.qsl.net/pg4i/download/xdx-%{version}.tar.gz
@@ -40,12 +40,15 @@
%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%doc %{_mandir}/man1/xdx*
+%doc %{_mandir}/man1/xdx.1*
%{_bindir}/xdx
%{_datadir}/xdx/
%{_datadir}/applications/Xdx.desktop
%changelog
+* Fri Mar 09 2007 Dag Wieers <dag at wieers.com> - 2.2-2
+- Fixed group.
+
* Sun Nov 12 2006 Dries Verachtert <dries at ulyssis.org> - 2.2-1
- Updated to release 2.2.
Modified: trunk/rpms/yum-metadata-parser/yum-metadata-parser.spec
===================================================================
--- trunk/rpms/yum-metadata-parser/yum-metadata-parser.spec 2007-03-07 15:21:36 UTC (rev 5224)
+++ trunk/rpms/yum-metadata-parser/yum-metadata-parser.spec 2007-03-09 21:50:51 UTC (rev 5225)
@@ -2,6 +2,7 @@
# Authority: dag
### Ironically, yum 2.4 needs sqlite2, while this needs sqlite3
+# ExclusiveDist:
# ExcludeDist: el4
%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
More information about the svn-commits
mailing list