[svn] r5183 - in trunk/rpms: blender clamav freealut lilo most
openal
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Feb 20 04:10:40 CET 2007
Author: dag
Date: 2007-02-20 04:10:36 +0100 (Tue, 20 Feb 2007)
New Revision: 5183
Added:
trunk/rpms/openal/openal-0.0.8-arch.patch
trunk/rpms/openal/openal-0.0.8-no-undefined.patch
trunk/rpms/openal/openal-0.0.8-pause.patch
trunk/rpms/openal/openal-0.0.8-pkgconfig.patch
Modified:
trunk/rpms/blender/blender.spec
trunk/rpms/clamav/clamav.spec
trunk/rpms/freealut/freealut.spec
trunk/rpms/lilo/lilo.spec
trunk/rpms/most/most.spec
trunk/rpms/openal/openal.spec
Log:
Updates
Modified: trunk/rpms/blender/blender.spec
===================================================================
--- trunk/rpms/blender/blender.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/blender/blender.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -7,11 +7,13 @@
%{?el2:%define _without_freedesktop 1}
%{?rh6:%define _without_freedesktop 1}
+%define python_inc %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_inc()')
+
%define desktop_vendor rpmforge
Summary: 3D modeling, animation, rendering and post-production
Name: blender
-Version: 2.42
+Version: 2.43
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -37,7 +39,7 @@
they are users of Windows, Linux, Irix, Sun Solaris, FreeBSD or OSX.
%prep
-%setup -n blender%{version}
+%setup
%{__cat} <<EOF >blender.desktop
[Desktop Entry]
@@ -51,11 +53,13 @@
Encoding=UTF-8
EOF
+### blender now works with a new build system, named Scons
+%{__perl} -pi -e 's|use_openal =.*|use_openal = 'true'|g;' SConstruct
+
%build
-# blender now works with a new build system, named Scons
-sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
-scons clean
-scons
+#scons clean
+#export BF_PYTHON_INC="%{python_inc}"
+scons BF_PYTHON_INC="%{python_inc}"
%install
%{__rm} -rf %{buildroot}
@@ -96,6 +100,9 @@
%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-blender.desktop}
%changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 2.43-1
+- Updated to release 2.43.
+
* Sun Aug 06 2006 Dag Wieers <dag at wieers.com> - 2.42-1
- Updated to release 2.42.
Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/clamav/clamav.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -11,7 +11,7 @@
Summary: Anti-virus software
Name: clamav
Version: 0.90
-Release: 1
+Release: 3
License: GPL
Group: Applications/System
URL: http://www.clamav.net/
@@ -353,7 +353,13 @@
%{_libdir}/pkgconfig/libclamav.pc
%changelog
-* Tue Dec 12 2006 Dag Wieers <dag at wieers.com> - 0.90-1
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.90-3
+- Do the right thing...
+
+* Mon Feb 19 2007 Dag Wieers <dag at wieers.com> - 0.90-2
+- The tarball was re-rolled before public release. Sigh.
+
+* Tue Feb 13 2007 Dag Wieers <dag at wieers.com> - 0.90-1
- Updated to release 0.90.
* Tue Dec 12 2006 Dag Wieers <dag at wieers.com> - 0.88.7-1
Modified: trunk/rpms/freealut/freealut.spec
===================================================================
--- trunk/rpms/freealut/freealut.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/freealut/freealut.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -3,16 +3,17 @@
Summary: OpenAL Utility Toolkit
Name: freealut
-Version: 1.0.1
-Release: 1.2
+Version: 1.1.0
+Release: 1
License: LGPL
Group: Development/Libraries
URL: http://openal.org/
Source: http://openal.org/openal_webstf/downloads/freealut-%{version}.tar.gz
+Patch0: freealut-1.1.0-openal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, openal-devel
+BuildRequires: gcc-c++, automake >= 1.9, openal-devel
%description
Freealut is the OpenAL Utility Toolkit.
@@ -29,6 +30,7 @@
%prep
%setup
+%patch0 -p0
%build
%configure
@@ -36,35 +38,31 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
-%{_bindir}/freealut-config
%{_libdir}/libalut.so.*
%files devel
%defattr(-, root, root, 0755)
-%dir %{_includedir}/AL/
-%{_includedir}/AL/alut.h
+%{_bindir}/freealut-config
+%{_includedir}/AL/
%{_libdir}/libalut.a
-%{_libdir}/libalut.so
%exclude %{_libdir}/libalut.la
+%{_libdir}/libalut.so
%{_libdir}/pkgconfig/freealut.pc
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.0.1-1.2
-- Rebuild for Fedora Core 5.
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 1.1.0-1
+- Updated to release 1.1.0.
* Sat Feb 04 2006 Dries Verachtert <dries at ulyssis.org> - 1.0.1-1
- Initial package.
Modified: trunk/rpms/lilo/lilo.spec
===================================================================
--- trunk/rpms/lilo/lilo.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/lilo/lilo.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -7,28 +7,20 @@
Summary: The boot loader for Linux and other operating systems
Name: lilo
-Version: 22.7
-Release: 1.2
+Version: 22.8
+Release: 1
License: MIT
Group: System Environment/Base
URL: http://home.san.rr.com/johninsd/
Source: http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-%{version}.src.tar.gz
Source2: keytab-lilo.c
-#Patch3: lilo-21.4.4-graphical.patch
-#Patch4: lilo-0.21-enableflame.patch
-#Patch5: lilo-0.21-broken.patch
-#Patch6: lilo-21.4.4-sa5300.patch
-#Patch7: lilo-21.4.4-boot.patch
-#Patch8: lilo-21.4.4-i2o.patch
-#Patch9: lilo-21.4.4-unsafe.patch
-#Patch10: lilo-21.4.4-2DAC960.patch
-#Patch100: lilo-21.4.4-lvm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Exclusivearch: i386 x86_64
-BuildRequires: tetex-latex, fileutils, tetex-dvips, dev86
+BuildRequires: tetex-latex, tetex-dvips, fileutils, dosfstools
+BuildRequires: dev86 >= 0.16.10
Requires: mkinitrd >= 3.4.7
Prereq: /sbin/grubby
@@ -40,20 +32,9 @@
%prep
%setup
-#%patch3 -p1 -b .graphical
-##%patch4 -p1 -b .enableflame
-## work around broken kernel headers
-#%patch5 -p1 -b .broken
-#%patch6 -p1 -b .sa5300
-#%patch7 -p1 -b .boot
-#%patch8 -p1 -b .i2o
-#%patch9 -p1 -b .unsafe
-#%patch10 -p1 -b .DAC960
-#%patch100 -b .lvm
-%{__perl} -pi.orig -e 's|^(#define LILO_H)|$1\n#include <asm/page.h>|' lilo.h
%build
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} all
${CC:-gcc} %{optflags} -o keytab-lilo %{SOURCE2}
%{__make} -C doc || :
dvips doc/user.dvi -o doc/User_Guide.ps
@@ -62,11 +43,9 @@
%install
%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_mandir}
-%makeinstall \
- ROOT="%{buildroot}" \
+%{__make} install ROOT="%{buildroot}" \
MAN_DIR="%{_mandir}"
-#%{__mv} -f %{buildroot}%{_sbindir} %{buildroot}%{_bindir}
+%{__mv} -v %{buildroot}/sbin %{buildroot}%{_bindir}
%{__install} -Dp -m0755 keytab-lilo %{buildroot}%{_bindir}/keytab-lilo
%post
@@ -82,27 +61,31 @@
%files
%defattr(-, root, root, 0755)
%doc CHANGES COPYING INCOMPAT QuickInst README doc/
-%doc %{_mandir}/man?/*
-%{_bindir}/*
-/boot/*
-/sbin/*
+%doc %{_mandir}/man5/lilo.conf.5*
+%doc %{_mandir}/man8/lilo.8*
+%doc %{_mandir}/man8/mkrescue.8*
+%{_bindir}/keytab-lilo
+%{_bindir}/lilo
+%{_bindir}/mkrescue
+/boot/diag1.img
+/boot/diag2.img
%exclude %{_sbindir}/keytab-lilo.pl
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 22.7-1.2
-- Rebuild for Fedora Core 5.
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 22.8-1
+- Updated to release 22.8.
-* Fri Apr 29 2005 Dag Wieers <dag at wieers.com> - 21.7-1
-- Updated to release 21.7.
+* Fri Apr 29 2005 Dag Wieers <dag at wieers.com> - 22.7-1
+- Updated to release 22.7.
-* Thu Nov 18 2004 Dag Wieers <dag at wieers.com> - 21.6.1-1
-- Updated to release 21.6.1.
+* Thu Nov 18 2004 Dag Wieers <dag at wieers.com> - 22.6.1-1
+- Updated to release 22.6.1.
-* Fri Sep 03 2004 Dag Wieers <dag at wieers.com> - 21.6-1
-- Updated to release 21.6.
+* Fri Sep 03 2004 Dag Wieers <dag at wieers.com> - 22.6-1
+- Updated to release 22.6.
-* Tue Apr 13 2004 Dag Wieers <dag at wieers.com> - 21.5.9-1
-- Updated to release 21.5.9.
+* Tue Apr 13 2004 Dag Wieers <dag at wieers.com> - 22.5.9-1
+- Updated to release 22.5.9.
* Mon Nov 17 2003 Dag Wieers <dag at wieers.com> - 21.4.4-0
- Added LVM /boot patch.
Modified: trunk/rpms/most/most.spec
===================================================================
--- trunk/rpms/most/most.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/most/most.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -2,7 +2,7 @@
# Authority: dag
# Upstream: John E. Davis <davis$space,mit,edu>
-Summary: text viewer similar to more or less, but with additional capabilities
+Summary: Text viewer similar to more or less, but with additional capabilities
Name: most
Version: 4.10.2
Release: 1.2
@@ -24,8 +24,9 @@
%prep
%setup
-%build
%{__perl} -pi.orig -e 's|/usr/lib|%{_libdir}|' configure
+
+%build
%configure
%{__make} %{?_smp_mflags}
@@ -44,9 +45,6 @@
%{_bindir}/most
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 4.10.2-1.2
-- Rebuild for Fedora Core 5.
-
* Thu Oct 13 2005 Dries Verachtert <dries at ulyssis.org> - 4.10.2-1
- Updated to release 4.10.2.
Added: trunk/rpms/openal/openal-0.0.8-arch.patch
===================================================================
--- trunk/rpms/openal/openal-0.0.8-arch.patch (rev 0)
+++ trunk/rpms/openal/openal-0.0.8-arch.patch 2007-02-20 03:10:36 UTC (rev 5183)
@@ -0,0 +1,11 @@
+--- openal-0.0.8/src/Makefile.in.org 2006-01-30 17:52:29.000000000 +0100
++++ openal-0.0.8/src/Makefile.in 2006-01-30 17:53:40.000000000 +0100
+@@ -327,7 +327,7 @@
+
+
+ # Add compiler flags.
+-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
++libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
+
+ # The -no-undefined flag is neccessary for building DLLs on Windows.
+ libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)
Added: trunk/rpms/openal/openal-0.0.8-no-undefined.patch
===================================================================
--- trunk/rpms/openal/openal-0.0.8-no-undefined.patch (rev 0)
+++ trunk/rpms/openal/openal-0.0.8-no-undefined.patch 2007-02-20 03:10:36 UTC (rev 5183)
@@ -0,0 +1,14 @@
+--- src/Makefile.am.orig 2006-02-27 11:51:57.000000000 +0100
++++ src/Makefile.am 2006-02-27 11:53:13.000000000 +0100
+@@ -214,9 +214,9 @@
+ libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+
+ # The -no-undefined flag is neccessary for building DLLs on Windows.
+-libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)
++libopenal_la_LDFLAGS = -no-undefined -Wl,--no-undefined $(PROFILINGLDFLAGS)
+
+ # We use sin and friends, so we might need -lm, autoconf takes care of this.
+-libopenal_la_LIBADD = $(LIBM) $(asm_ldadd)
++libopenal_la_LIBADD = $(LIBM) $(asm_ldadd) -lpthread
+
+ SUBDIRS = $(X86_SUBDIR)
Added: trunk/rpms/openal/openal-0.0.8-pause.patch
===================================================================
--- trunk/rpms/openal/openal-0.0.8-pause.patch (rev 0)
+++ trunk/rpms/openal/openal-0.0.8-pause.patch 2007-02-20 03:10:36 UTC (rev 5183)
@@ -0,0 +1,66 @@
+--- portable/src/alc/alc_context.c.pause 2006-01-23 16:12:09.000000000 +0100
++++ portable/src/alc/alc_context.c 2006-08-11 11:30:23.000000000 +0200
+@@ -236,10 +236,17 @@
+ /* someone unpaused us */
+ ispaused = AL_FALSE;
+
+- _alcDeviceResume( cc->write_device );
+- _alcDeviceResume( cc->read_device );
++ if( cc->write_device )
++ _alcDeviceResume( cc->write_device );
++ if( cc->read_device )
++ _alcDeviceResume( cc->read_device );
+
+ _alcUnlockAllContexts();
++ /* If the last context got destroyed after pausing, then the
++ mixer will have been destroyed too, causing it to be
++ unlocked, so first try to lock it to make sure it is
++ actually locked before unlocking it. */
++ _alTryLockMixerPause();
+ _alUnlockMixerPause();
+ } else {
+ /* just unlock contexts */
+--- portable/src/al_mixer.c.fixes 2006-08-11 12:38:47.000000000 +0200
++++ portable/src/al_mixer.c 2006-08-11 12:39:42.000000000 +0200
+@@ -155,14 +155,6 @@
+ static void _alAddBufferToStreamingList( ALuint bid );
+
+ /*
+- * _alTryLockMixerPause( void )
+- *
+- * Try to lock the mix_pause mutex. Return AL_TRUE if lock suceeded, AL_FALSE
+- * otherwise.
+- */
+-static ALboolean _alTryLockMixerPause( void );
+-
+-/*
+ * _alMixSources
+ *
+ * This is the where most of the action is directed.
+@@ -1180,7 +1172,7 @@
+ * asynchronous mixers. Return AL_TRUE if the pause mutex was locked,
+ * AL_FALSE otherwise.
+ */
+-static ALboolean _alTryLockMixerPause( void ) {
++ALboolean _alTryLockMixerPause( void ) {
+ if(_alTryLockMutex( pause_mutex ) == 0) {
+ return AL_TRUE;
+ }
+--- portable/src/al_mixer.h.fixes 2006-08-11 12:39:10.000000000 +0200
++++ portable/src/al_mixer.h 2006-08-11 12:39:44.000000000 +0200
+@@ -108,6 +108,14 @@
+ */
+
+ /*
++ * _alTryLockMixerPause( void )
++ *
++ * Try to lock the mix_pause mutex. Return AL_TRUE if lock suceeded, AL_FALSE
++ * otherwise.
++ */
++ALboolean _alTryLockMixerPause( void );
++
++/*
+ * Lock the MixerPause mutex, which is use to "pause" the mixer.
+ */
+ void _alLockMixerPause( void );
+
Added: trunk/rpms/openal/openal-0.0.8-pkgconfig.patch
===================================================================
--- trunk/rpms/openal/openal-0.0.8-pkgconfig.patch (rev 0)
+++ trunk/rpms/openal/openal-0.0.8-pkgconfig.patch 2007-02-20 03:10:36 UTC (rev 5183)
@@ -0,0 +1,38 @@
+--- admin/pkgconfig/openal-config.in.orig 2006-02-27 11:36:14.000000000 +0100
++++ admin/pkgconfig/openal-config.in 2006-02-27 11:36:55.000000000 +0100
+@@ -6,8 +6,6 @@
+ includedir="@includedir@"
+ libdir="@libdir@"
+ PACKAGE_VERSION="@PACKAGE_VERSION@"
+-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+-PTHREAD_LIBS="@PTHREAD_LIBS@"
+
+ openal_dynamic_ldflags="-lopenal"
+ # TODO: configure should provide the following...
+@@ -158,7 +156,7 @@
+ else
+ incpath="-I${includedir}"
+ fi
+- echo "${PTHREAD_CFLAGS} ${incpath}"
++ echo "${incpath}"
+ fi
+
+ if test "$echo_libs" = "yes"; then
+@@ -172,5 +170,5 @@
+ else
+ ldflags="${openal_dynamic_ldflags}"
+ fi
+- echo "${libpathflag} ${ldflags} ${PTHREAD_LIBS}"
++ echo "${libpathflag} ${ldflags}"
+ fi
+--- admin/pkgconfig/openal.pc.in.orig 2006-02-27 11:36:18.000000000 +0100
++++ admin/pkgconfig/openal.pc.in 2006-02-27 11:37:30.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ Name: OpenAL
+ Description: OpenAL is a cross-platform 3D audio API.
+-Requires: @requirements@
++Requires:
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lopenal
+ Cflags: -I${includedir}
Modified: trunk/rpms/openal/openal.spec
===================================================================
--- trunk/rpms/openal/openal.spec 2007-02-19 12:36:08 UTC (rev 5182)
+++ trunk/rpms/openal/openal.spec 2007-02-20 03:10:36 UTC (rev 5183)
@@ -1,20 +1,35 @@
# $Id$
-# Authority: rudolf
+# Authority: dries
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el3:%define _without_alsa 1}
+%{?rh9:%define _without_alsa 1}
+%{?rh7:%define _without_alsa 1}
+
+%{?el2:%define _without_alsa 1}
+%{?el2:%define _without_arts 1}
+
Summary: Open Audio Library
Name: openal
Version: 0.0.8
-Release: 1
+Release: 2
License: LGPL
Group: System Environment/Libraries
URL: http://www.openal.org/
Source0: http://www.openal.org/openal_webstf/downloads/openal-%{version}.tar.gz
Source1: openalrc
+Patch0: openal-0.0.8-arch.patch
+Patch1: openal-0.0.8-no-undefined.patch
+Patch2: openal-0.0.8-pkgconfig.patch
+Patch3: openal-0.0.8-pause.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, arts-devel, esound-devel, libogg-devel, libvorbis-devel
-BuildRequires: texinfo, alsa-lib-devel
+BuildRequires: SDL-devel, esound-devel, libogg-devel, libvorbis-devel
+BuildRequires: texinfo
+%{!?_without_alsa:BuildRequires: alsa-lib-devel}
+%{!?_without_arts:BuildRequires: arts-devel}
%description
OpenAL is an audio library designed in the spirit of OpenGL--machine
@@ -33,32 +48,38 @@
%prep
%setup
+#patch1
+%patch2
+%patch3 -p1
+#./autogen.sh
+%patch0 -p1
+### Fix reference to /usr/lib instead of %%{_libdir}
+%{__perl} -pi -e 's|/lib\b|/%{_lib}|g' admin/pkgconfig/Makefile.in
+
%build
-%configure --enable-arts \
- --enable-esd \
- --enable-vorbis \
- --enable-sdl \
- --disable-smpeg \
- --enable-capture \
- --enable-alsa
+%configure \
+ --disable-smpeg \
+%{!?_without_alsa:--enable-alsa} \
+%{!?_without_arts:--enable-arts} \
+ --enable-capture \
+ --enable-esd \
+ --enable-sdl \
+ --enable-vorbis
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/openalrc
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%clean
%{__rm} -rf %{buildroot}
-%post
-/sbin/ldconfig &>/dev/null
-
-%postun
-/sbin/ldconfig &>/dev/null
-
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING INSTALL NOTES PLATFORM README
@@ -67,14 +88,17 @@
%files devel
%defattr(-, root, root, 0755)
+%{_bindir}/openal-config
+%{_includedir}/AL/
%{_libdir}/libopenal.a
+%exclude %{_libdir}/libopenal.la
%{_libdir}/libopenal.so
-%{_includedir}/AL/
%{_libdir}/pkgconfig/openal.pc
-%{_bindir}/openal-config
-%exclude %{_libdir}/libopenal.la
%changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 0.0.8-2
+- Added patches to build on x86_64.
+
* Sat Dec 31 2005 Dries Verachtert <dries at ulyssis.org> - 0.0.8-1
- Updated to release 0.0.8.
- Source doesn't contain an openal.info file anymore.
More information about the svn-commits
mailing list