[svn] r5226 - in trunk/rpms: 3ddesktop 4g8 SDL_mixer albumart alevt
allegro clamav cricket etherape nagios sdlmame socat ssldump
trac yum
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Mar 11 15:09:38 CET 2007
Author: dag
Date: 2007-03-11 15:09:35 +0100 (Sun, 11 Mar 2007)
New Revision: 5226
Added:
trunk/rpms/SDL_mixer/SDL_mixer-1.2.6.spec
Modified:
trunk/rpms/3ddesktop/3ddesktop.spec
trunk/rpms/4g8/4g8.spec
trunk/rpms/SDL_mixer/SDL_mixer.spec
trunk/rpms/albumart/albumart.spec
trunk/rpms/alevt/alevt.spec
trunk/rpms/allegro/allegro.spec
trunk/rpms/clamav/clamav.spec
trunk/rpms/cricket/cricket.spec
trunk/rpms/etherape/etherape.spec
trunk/rpms/nagios/nagios.spec
trunk/rpms/sdlmame/sdlmame.spec
trunk/rpms/socat/socat.spec
trunk/rpms/ssldump/ssldump.spec
trunk/rpms/trac/trac.spec
trunk/rpms/yum/yum-1.0-thias.spec
Log:
Updates
Modified: trunk/rpms/3ddesktop/3ddesktop.spec
===================================================================
--- trunk/rpms/3ddesktop/3ddesktop.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/3ddesktop/3ddesktop.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -7,19 +7,16 @@
%{?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}
Summary: OpenGL program for switching virtual desktops in 3D
Name: 3ddesktop
-Version: 0.2.8
-Release: 1.2
+Version: 0.2.9
+Release: 1
License: GPL
Group: User Interface/Desktops
URL: http://desk3d.sourceforge.net/
@@ -30,8 +27,8 @@
BuildRequires: autoconf >= 2.58, gcc-c++, zlib-devel
BuildRequires: imlib2-devel, qt-devel, kdelibs-devel
-%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGL, XFree86-Mesa-libGLU}
-%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
+%{?_with_modxorg:BuildRequires: libXt-devel, libXext-devel, libICE-devel, libXxf86vm-devel}
%{?el2:BuildRequires: Mesa-devel}
Requires: imlib2
@@ -52,7 +49,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%clean
%{__rm} -rf %{buildroot}
@@ -60,14 +57,16 @@
%files
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING INSTALL NEWS README* TODO
+%doc %{_mandir}/man1/3ddesk.1*
+%doc %{_mandir}/man1/3ddeskd.1*
%config(noreplace) %{_sysconfdir}/3ddesktop.conf
%{_bindir}/3ddesk
%{_bindir}/3ddeskd
%{_datadir}/3ddesktop/
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.2.8-1.2
-- Rebuild for Fedora Core 5.
+* Sat Mar 10 2007 Dag Wieers <dag at wieers.com> - 0.2.9-1
+- Updated to release 0.2.9.
* Thu Mar 24 2005 Dag Wieers <dag at wieers.com> - 0.2.8-1
- Updated to release 0.2.8.
Modified: trunk/rpms/4g8/4g8.spec
===================================================================
--- trunk/rpms/4g8/4g8.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/4g8/4g8.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -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: Packet redirection tool for interception on switched networks
Name: 4g8
Version: 1.0
@@ -32,9 +38,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
@@ -42,7 +46,8 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+#makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%files
%defattr(-, root, root, 0755)
Added: trunk/rpms/SDL_mixer/SDL_mixer-1.2.6.spec
===================================================================
--- trunk/rpms/SDL_mixer/SDL_mixer-1.2.6.spec (rev 0)
+++ trunk/rpms/SDL_mixer/SDL_mixer-1.2.6.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -0,0 +1,71 @@
+# $Id$
+# Authority: dries
+
+### Only build for Enterprise Linux (that are missing it) and unsupported fedoras
+# ExclusiveDist: rh7 rh9 el3 fc1 fc2 fc3 el4 el5
+
+Summary: Simple multi-channel audio mixer
+Name: SDL_mixer
+Version: 1.2.6
+Release: 1
+License: LGPL
+Group: System Environment/Libraries
+URL: http://www.libsdl.org/projects/SDL_mixer/
+
+Source: http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++, SDL-devel, libvorbis-devel, smpeg-devel, mikmod-devel
+
+%description
+SDL_mixer is a simple multi-channel audio mixer. It supports 8 channels of 16
+bit stereo audio, plus a single channel of music, mixed by the popular MikMod
+MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries.
+
+%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
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%{__install} -D playmus %{buildroot}%{_bindir}/playmus
+%{__install} -D playwave %{buildroot}%{_bindir}/playwave
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGES COPYING README
+%{_bindir}/playmus
+%{_bindir}/playwave
+%{_libdir}/libSDL_mixer-*.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%dir %{_includedir}/SDL/
+%{_includedir}/SDL/SDL_mixer.h
+%{_libdir}/libSDL_mixer.a
+%{_libdir}/libSDL_mixer.so
+%exclude %{_libdir}/*.la
+
+%changelog
+* Mon Jan 30 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.6-1
+- Initial package, based on the spec file provided by the PLD Linux Distribution.
Property changes on: trunk/rpms/SDL_mixer/SDL_mixer-1.2.6.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/SDL_mixer/SDL_mixer.spec
===================================================================
--- trunk/rpms/SDL_mixer/SDL_mixer.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/SDL_mixer/SDL_mixer.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -2,12 +2,12 @@
# Authority: dries
### Only build for Enterprise Linux (that are missing it) and unsupported fedoras
-# ExclusiveDist: rh7 rh9 el3 fc1 fc2 fc3 el4
+# ExclusiveDist: rh7 rh9 el3 fc1 fc2 fc3 el4 el5
Summary: Simple multi-channel audio mixer
Name: SDL_mixer
-Version: 1.2.6
-Release: 1.2
+Version: 1.2.7
+Release: 1
License: LGPL
Group: System Environment/Libraries
URL: http://www.libsdl.org/projects/SDL_mixer/
@@ -15,7 +15,7 @@
Source: http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, SDL-devel, libvorbis-devel, smpeg-devel, mikmod-devel
+BuildRequires: gcc-c++, SDL-devel >= 1.2.10, libvorbis-devel, smpeg-devel, mikmod-devel
%description
SDL_mixer is a simple multi-channel audio mixer. It supports 8 channels of 16
@@ -41,9 +41,9 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
-%{__install} -D playmus %{buildroot}%{_bindir}/playmus
-%{__install} -D playwave %{buildroot}%{_bindir}/playwave
+%{__make} install DESTDIR="%{buildroot}"
+%{__install} -D build/playmus %{buildroot}%{_bindir}/playmus
+%{__install} -D build/playwave %{buildroot}%{_bindir}/playwave
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -67,8 +67,8 @@
%exclude %{_libdir}/*.la
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.6-1.2
-- Rebuild for Fedora Core 5.
+* Sat Mar 10 2007 Dag Wieers <dag at wieers.com> - 1.2.7-1
+- Updated to release 1.2.7.
* Mon Jan 30 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.6-1
- Initial package, based on the spec file provided by the PLD Linux Distribution.
Modified: trunk/rpms/albumart/albumart.spec
===================================================================
--- trunk/rpms/albumart/albumart.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/albumart/albumart.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -32,19 +32,15 @@
%install
%{__rm} -rf %{buildroot}
-python setup.py install \
- --root="%{buildroot}" \
- --record="INSTALLED_FILES"
+python setup.py install --root="%{buildroot}"
%clean
%{__rm} -rf %{buildroot}
%files -f INSTALLED_FILES
%defattr(-, root, root, 0755)
+%{_libdir}/albumart/
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.1-0.2
-- Rebuild for Fedora Core 5.
-
* Mon Jun 30 2003 Dag Wieers <dag at wieers.com> - 1.1-0
- Initial package. (using DAR)
Modified: trunk/rpms/alevt/alevt.spec
===================================================================
--- trunk/rpms/alevt/alevt.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/alevt/alevt.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -4,6 +4,12 @@
%{?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}
+
%{?rh7:%define _without_freedesktop 1}
%{?el2:%define _without_freedesktop 1}
%{?rh6:%define _without_freedesktop 1}
@@ -20,8 +26,8 @@
Source: http://www.goron.de/~froese/alevt/alevt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-%{?_without_xorg:BuildRequires: XFree86-devel}
-%{!?_without_xorg:BuildRequires: xorg-x11-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
+%{?_with_modxorg:BuildRequires: libX11-devel}
%description
AleVT is a teletext/videotext decoder and browser for the bttv driver
Modified: trunk/rpms/allegro/allegro.spec
===================================================================
--- trunk/rpms/allegro/allegro.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/allegro/allegro.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -4,14 +4,18 @@
%{?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}
+%{?el2:%define _without_arts 1}
+
Summary: Game library
Name: allegro
Version: 4.2.1
@@ -24,9 +28,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: allegro-tools
-BuildRequires: gcc-c++, esound-devel, arts-devel, pkgconfig, texinfo
+BuildRequires: gcc-c++, esound-devel, pkgconfig, texinfo
%{?_without_modxorg:BuildRequires: XFree86-devel}
%{!?_without_modxorg:BuildRequires: libXext-devel}
+%{!?_without_arts:BuildRequires: arts-devel}
%description
Allegro is a multi-platform game library for C/C++ developers that provides
@@ -51,19 +56,17 @@
%build
%configure
%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} docs-dvi
+### texi2dvi missing on EL5
+#%{__make} %{?_smp_mflags} docs-dvi
%install
%{__rm} -rf %{buildroot}
%makeinstall install-gzipped-man install-gzipped-info
%{__rm} -f %{buildroot}%{_datadir}/info/dir
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%clean
%{__rm} -rf %{buildroot}
@@ -100,8 +103,5 @@
* Sun Dec 03 2006 Dries Verachtert <dries at ulyssis.org> - 4.2.1-1
- Updated to release 4.2.1.
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 4.2.0-1.2
-- Rebuild for Fedora Core 5.
-
* Sun Dec 04 2005 Dries Verachtert <dries at ulyssis.org> - 4.2.0-1
- Initial package.
Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/clamav/clamav.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -362,7 +362,7 @@
* 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.
+- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl)
* 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)
Modified: trunk/rpms/cricket/cricket.spec
===================================================================
--- trunk/rpms/cricket/cricket.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/cricket/cricket.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -1,54 +1,53 @@
# Authority: nac
# $Id$
-%define version 1.0.5
-%define release 6.0
-%define name cricket
-%define httpd_user apache
+%define version 1.0.5
+%define release 6.0
+%define name cricket
+%define httpd_user apache
# /usr/lib/cricket will be the "cricket home"
# - www/cgi will hold CGIs
# - www/images will hold images
-%define app_dir %{_libdir}/%{name}/
-%define cgi_dir %{app_dir}/www/cgi/
-%define img_dir %{app_dir}/www/images/
+%define app_dir %{_libdir}/%{name}/
+%define cgi_dir %{app_dir}/www/cgi/
+%define img_dir %{app_dir}/www/images/
# Cache graphs here; must be writable by web server!
-%define cache_dir %{_var}/cache/%{name}/
+%define cache_dir %{_var}/cache/%{name}/
# /var/lib/cricket/ will contain RRD data
-%define data_dir %{_var}/lib/%{name}/
+%define data_dir %{_var}/lib/%{name}/
# /var/log/cricket will contain logs (duh)
-%define log_dir %{_var}/log/%{name}/
+%define log_dir %{_var}/log/%{name}/
# /etc/cricket/config will be the default config tree
-%define etc_dir %{_sysconfdir}/%{name}/
-%define config_dir %{etc_dir}/config/
+%define etc_dir %{_sysconfdir}/%{name}/
+%define config_dir %{etc_dir}/config/
-%define cron_dir %{_sysconfdir}/cron.d/
-%define httpd_dir %{_sysconfdir}/httpd/conf.d/
+%define cron_dir %{_sysconfdir}/cron.d/
+%define httpd_dir %{_sysconfdir}/httpd/conf.d/
-Summary: Network statistics collection tool
-Name: %{name}
-Version: %{version}
-Release: %{release}
-License: GPL
-Group: Applications/System
-URL: http://cricket.sourceforge.net
-Requires: perl(RRDs), perl(DB_File), perl(Time::HiRes), perl-SNMP_Session
-Requires: perl(Date::Format), perl(Digest::MD5), perl(LWP), webserver
-Source0: http://download.sourceforge.net/cricket/%{name}-%{version}.tar.gz
-Source1: cricket.cron
-Source2: cricket.apache
-Patch1: cricket-paths.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-AutoReq: 0
-AutoProv: 0
+Summary: Network statistics collection tool
+Name: %{name}
+Version: %{version}
+Release: %{release}
+License: GPL
+Group: Applications/System
+URL: http://cricket.sourceforge.net
+Requires: perl(RRDs), perl(DB_File), perl(Time::HiRes), perl-SNMP_Session
+Requires: perl(Date::Format), perl(Digest::MD5), perl(LWP), webserver
+Source0: http://download.sourceforge.net/cricket/%{name}-%{version}.tar.gz
+Source1: cricket.cron
+Source2: cricket.apache
+Patch1: cricket-paths.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+AutoReq: 0
+AutoProv: 0
%description
-
Cricket is a high performance, extremely flexible system for monitoring
trends in time-series data. Cricket was expressly developed to help
network managers visualize and understand the traffic on their networks,
Modified: trunk/rpms/etherape/etherape.spec
===================================================================
--- trunk/rpms/etherape/etherape.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/etherape/etherape.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -7,6 +7,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}
+
%{?rh7:%define _without_freedesktop 1}
%{?el2:%define _without_freedesktop 1}
@@ -41,9 +47,7 @@
%{__perl} -pi.orig -e 's|res_mkquery|__res_mkquery|g' configure
-%{?el4:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' configure src/*.c src/*.h}
-%{?fc3:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' configure src/*.c src/*.h}
-%{?fc2:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' configure src/*.c src/*.h}
+%{!?_without_pcapbpf_h:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
%{__cat} <<EOF >etherape.console
USER=root
Modified: trunk/rpms/nagios/nagios.spec
===================================================================
--- trunk/rpms/nagios/nagios.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/nagios/nagios.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -14,7 +14,7 @@
Summary: Open Source host, service and network monitoring program
Name: nagios
-Version: 2.7
+Version: 2.8
Release: 1
License: GPL
Group: Applications/System
@@ -185,6 +185,9 @@
%{_includedir}/nagios/
%changelog
+* Sat Mar 10 2007 Dag Wieers <dag at wieers.com> - 2.8-1
+- Updated to release 2.8.
+
* Wed Jan 24 2007 Dag Wieers <dag at wieers.com> - 2.7-1
- Updated to release 2.7.
Modified: trunk/rpms/sdlmame/sdlmame.spec
===================================================================
--- trunk/rpms/sdlmame/sdlmame.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/sdlmame/sdlmame.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -1,6 +1,15 @@
# $Id$
# Authority: matthias
+%{?dist: %{expand: %%define %dist 1}}
+%{?fedora: %{expand: %%define fc%{fedora} 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}
+
%define mamever 113
Summary: SDL port of the Multi Arcade Machine Emulator (MAME)
@@ -14,7 +23,9 @@
Source: http://rbelmont.mameworld.info/sdlmame0%{mamever}.zip
Patch0: sdlmame0109-genericbuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, expat-devel, zlib-devel, libXinerama-devel
+BuildRequires: SDL-devel, expat-devel, zlib-devel
+%{?_with_modxorg:BuildRequires: libXinerama-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
%description
This is a simple SDL port of the almost legendary MAME. MAME is an arcade
Modified: trunk/rpms/socat/socat.spec
===================================================================
--- trunk/rpms/socat/socat.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/socat/socat.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -4,7 +4,7 @@
Summary: Relay for bidirectional data transfer between 2 channels
Name: socat
-Version: 1.5.0.0
+Version: 1.6.0.0
Release: 1
License: GPL
Group: Applications/Internet
@@ -26,32 +26,21 @@
%prep
%setup
-### FIXME: Make Makefile use autotool directory standard. (Please fix upstream)
-%{__perl} -pi.orig -e '
- s|\@bindir\@|\$(bindir)|;
- s|\@mandir\@|\$(mandir)|;
- ' Makefile.in
-
%build
%configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
-### FIXME: Makefile doesn't create target directories (Please fix upstream)
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
- %{buildroot}%{_mandir}/man1/
-
-%makeinstall
-
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-%doc *.sh socat.html xio.help
+%doc *.sh doc/*.css doc/*.help doc/*.html
%doc %{_mandir}/man1/socat.1*
%{_bindir}/filan
%{_bindir}/procan
Modified: trunk/rpms/ssldump/ssldump.spec
===================================================================
--- trunk/rpms/ssldump/ssldump.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/ssldump/ssldump.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -7,6 +7,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}
+
%define real_version 0.9b3
Summary: SSLSSLv3/TLS network protocol analyzer
@@ -36,9 +42,7 @@
%prep
%setup -n %{name}-%{real_version}
-%{?el4:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' base/*.c}
-%{?fc3:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' base/*.c}
-%{?fc2:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' base/*.c}
+%{!?_without_pcapbpf_h:%{__perl} -pi.orig -e 's|net/bpf.h|pcap-bpf.h|' src/*.c src/*.h}
%{?el3:%{__perl} -pi.orig -e 's|^(CFLAGS) \+= |$1 += -I/usr/kerberos/include |' Makefile.in}
%{?rh9:%{__perl} -pi.orig -e 's|^(CFLAGS) \+= |$1 += -I/usr/kerberos/include |' Makefile.in}
Modified: trunk/rpms/trac/trac.spec
===================================================================
--- trunk/rpms/trac/trac.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/trac/trac.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -6,7 +6,7 @@
Name: trac
Summary: Integrated SCM and project management tool
-Version: 0.10.3
+Version: 0.10.3.1
Release: 1
License: GPL
Group: Development/Tools
@@ -78,6 +78,9 @@
%{_localstatedir}/lib/trac/
%changelog
+* Sat Mar 10 2007 Dag Wieers <dag at wieers.com> - 0.10.3.1-1
+- Updated to release 0.10.3.1.
+
* Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.10.3-1
- Updated to release 0.10.3.
Modified: trunk/rpms/yum/yum-1.0-thias.spec
===================================================================
--- trunk/rpms/yum/yum-1.0-thias.spec 2007-03-09 21:50:51 UTC (rev 5225)
+++ trunk/rpms/yum/yum-1.0-thias.spec 2007-03-11 14:09:35 UTC (rev 5226)
@@ -1,6 +1,8 @@
# $Id$
# Authority: matthias
+# ExclusiveDist: el2 rh7 yd2 yd3
+
# Which distro to make the default configuration for, defaults to 'rh'
%{?_with_yd: %{expand: %%define distro yd}}
%{!?distro: %{expand: %%define distro rh}}
More information about the svn-commits
mailing list