packages: xmp/xmp.spec - up to 2.7.1 - dropped obsolete patches (including ...
lkrotowski
lkrotowski at pld-linux.org
Wed Sep 30 19:12:04 CEST 2009
Author: lkrotowski Date: Wed Sep 30 17:12:04 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.7.1
- dropped obsolete patches (including gcc 3.3 patch)
- dropped shared drivers (from mainline)
- added pulseaudio support
---- Files affected:
packages/xmp:
xmp.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/xmp/xmp.spec
diff -u packages/xmp/xmp.spec:1.22 packages/xmp/xmp.spec:1.23
--- packages/xmp/xmp.spec:1.22 Mon Feb 12 23:09:23 2007
+++ packages/xmp/xmp.spec Wed Sep 30 19:11:59 2009
@@ -1,35 +1,34 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without arts # without aRts audio plugin
-%bcond_without esd # without EsounD audio output plugin
-%bcond_without nas # without NAS audio output plugin
+%bcond_without arts # without aRts audio driver
+%bcond_without esd # without EsounD audio output driver
+%bcond_without nas # without NAS audio output driver
+%bcond_without pulseaudio # without PulseAudio audio output driver
%bcond_without xmms # without XMP as XMMS plugin
-%bcond_with nonfree # with ppunpack and fmopl (GPL-incompatible - non-distributable)
+%bcond_with nonfree # with recent fmopl (GPL-incompatible - non-distributable)
#
Summary: Extended Module Player
Summary(pl.UTF-8): Rozszerzony odtwarzacz modułów
Name: xmp
-Version: 2.0.5
-%define pver pre3
-Release: 0.%{pver}.3
+Version: 2.7.1
+Release: 1
License: GPL%{?with_nonfree: with non-commercial additions}
Group: Applications/Sound
-Source0: http://dl.sourceforge.net/xmp/%{name}-%{version}%{pver}.tar.bz2
-# Source0-md5: 749db9c8da956b403a959b4c8b909447
-Patch0: %{name}-gcc33.patch
-Patch1: %{name}-fix-shared.patch
-Patch2: %{name}-load-fix.patch
-Patch3: %{name}-nondfsg.patch
+Source0: http://dl.sourceforge.net/xmp/%{name}-%{version}.tar.gz
+# Source0-md5: bbed5ba3dc9bd8ff38133b31fd5b8846
+Patch0: %{name}-nondfsg.patch
URL: http://xmp.sourceforge.net/
-BuildRequires: XFree86-devel
%{?with_arts:BuildRequires: arts-devel}
BuildRequires: autoconf
BuildRequires: automake
%{?with_esd:BuildRequires: esound-devel}
%{?with_nas:BuildRequires: nas-devel}
+%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
%{?with_xmms:BuildRequires: rpmbuild(macros) >= 1.125}
%{?with_xmms:BuildRequires: xmms-devel}
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXt-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -48,54 +47,6 @@
próbki ze znakiem lub bez, little- lub big-endian z 32-bitową
interpolacją.
-%package X11
-Summary: Extended Module Player with GUI
-Summary(pl.UTF-8): Rozszerzony odtwarzacz modułów z graficznym interfejsem
-Group: X11/Applications/Sound
-Requires: %{name} = %{version}-%{release}
-
-%description X11
-Extended Module Player with GUI.
-
-%description X11 -l pl.UTF-8
-Rozszerzony odtwarzacz modułów z graficznym interfejsem.
-
-%package output-arts
-Summary: aRts audio output plugin for XMP
-Summary(pl.UTF-8): Wtyczka wyjścia dźwięku aRts dla XMP
-Group: Applications/Sound
-Requires: %{name} = %{version}-%{release}
-
-%description output-arts
-aRts audio output plugin for XMP.
-
-%description output-arts -l pl.UTF-8
-Wtyczka wyjścia dźwięku aRts dla XMP.
-
-%package output-esd
-Summary: EsounD audio output plugin for XMP
-Summary(pl.UTF-8): Wtyczka wyjścia dźwięku EsounD dla XMP
-Group: Applications/Sound
-Requires: %{name} = %{version}-%{release}
-
-%description output-esd
-EsounD audio output plugin for XMP.
-
-%description output-esd -l pl.UTF-8
-Wtyczka wyjścia dźwięku EsounD dla XMP.
-
-%package output-nas
-Summary: NAS audio output plugin for XMP
-Summary(pl.UTF-8): Wtyczka wyjścia dźwięku NAS dla XMP
-Group: Applications/Sound
-Requires: %{name} = %{version}-%{release}
-
-%description output-nas
-NAS audio output plugin for XMP.
-
-%description output-nas -l pl.UTF-8
-Wtyczka wyjścia dźwięku NAS dla XMP.
-
%package -n xmms-input-xmp
Summary: XMMS plugin that uses XMP library to play music modules
Summary(pl.UTF-8): Wtyczka dla XMMS-a odtwarzająca moduły dźwiękowe z użyciem XMP
@@ -111,35 +62,27 @@
XMP.
%prep
-%setup -q -n %{name}-%{version}-%{pver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%{?with_nonfree:%patch3 -p1}
+%setup -q -n %{name}-%{version}
+%{?with_nonfree:%patch0 -p1}
%build
cp -f /usr/share/automake/config.* scripts
%{__aclocal}
%{__autoconf}
-# alsa disabled - only 0.5 supported for now
%configure \
- --disable-alsa \
- %{!?with_arts:--disable-arts} \
- %{!?with_esd:--disable-esd} \
- %{!?with_nas:--disable-nas} \
- %{!?with_xmms:--disable-xmms} \
- --enable-dynamic
-%{__make}
+ %{?with_arts:--enable-arts} \
+ %{?with_esd:--enable-esd} \
+ %{?with_nas:--enable-nas} \
+ %{?with_pulseaudio:--enable-pulseaudio} \
+ %{?with_xmms:--enable-xmms-plugin}
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}
%{__make} install \
- DEST_DIR=$RPM_BUILD_ROOT \
- BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
- LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
- MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -149,38 +92,12 @@
%files
%defattr(644,root,root,755)
-%doc README docs/{CREDITS,ChangeLog,README.{awebug,fixloop,ppunpack,trackers,unsqsh},formats} etc/magic
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmp*.conf
+%doc README docs/{CREDITS,ChangeLog,README.{awebug,fixloop,trackers,unsqsh},formats}
+%dir %{_sysconfdir}/xmp
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmp/*.conf
%attr(755,root,root) %{_bindir}/xmp
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%dir %{_libdir}/xmp
-%dir %{_libdir}/xmp/drivers
-%attr(755,root,root) %{_libdir}/xmp/drivers/oss*.so
%{_mandir}/man1/xmp.1*
-%files X11
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xxmp
-%{_mandir}/man1/xxmp.1*
-
-%if %{with arts}
-%files output-arts
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xmp/drivers/arts.so
-%endif
-
-%if %{with esd}
-%files output-esd
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xmp/drivers/esd.so
-%endif
-
-%if %{with nas}
-%files output-nas
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xmp/drivers/nas.so
-%endif
-
%if %{with xmms}
%files -n xmms-input-xmp
%defattr(644,root,root,755)
@@ -193,6 +110,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2009/09/30 17:11:59 lkrotowski
+- up to 2.7.1
+- dropped obsolete patches (including gcc 3.3 patch)
+- dropped shared drivers (from mainline)
+- added pulseaudio support
+
Revision 1.22 2007/02/12 22:09:23 glen
- tabs in preamble
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmp/xmp.spec?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list