Author: bernie Update of /cvs/nonfree/rpms/uade/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24543 Modified Files: sources uade.spec Added Files: uade-2.13-audaciousinstalldestdir.patch uade-2.13-coreinstalldestdir.patch uade-2.13-fixaudaciousplugin.patch uade-2.13-makenamesane.patch uade-2.13-uade123installdestdir.patch uade-2.13-uadefsinstalldestdir.patch uade-2.13-uadeinstalldestdir.patch uade-2.13-xmmsinstalldestdir.patch Log Message: Upgrade to 2.13 uade-2.13-audaciousinstalldestdir.patch: Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE uade-2.13-audaciousinstalldestdir.patch --- --- uade-2.13/src/frontends/audacious/Makefile.in.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/frontends/audacious/Makefile.in 2010-03-01 22:14:29.841634777 +0800 @@ -30,8 +30,8 @@ $(CC) $(CFLAGS) -c $< install: - mkdir -p "$(AUDACIOUSPLUGINDIR)" - install libuade2.so "$(AUDACIOUSPLUGINDIR)" + mkdir -p "$(DESTDIR)$(AUDACIOUSPLUGINDIR)" + install libuade2.so "$(DESTDIR)$(AUDACIOUSPLUGINDIR)" clean: rm -f *.so *.o uade-2.13-coreinstalldestdir.patch: Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- NEW FILE uade-2.13-coreinstalldestdir.patch --- --- uade-2.13/src/Makefile.in.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/Makefile.in 2010-03-01 22:33:31.864767177 +0800 @@ -42,13 +42,13 @@ -rm -f cpuemu.c build68k cputmp.s cpustbl.c cputbl.h install: $(UADECORENAME) - mkdir -p "$(LIBDIR)" "$(PKGCONFIGDIR)" - chmod og+rx "$(LIBDIR)" - cp -f "$(UADECORENAME)" "$(LIBDIR)"/ - chmod og+rx "$(LIBDIR)/$(UADECORENAME)" - install ../uade.pc "$(PKGCONFIGDIR)"/ - chmod og+rx "$(PKGCONFIGDIR)" - chmod 644 "$(PKGCONFIGDIR)/uade.pc" + mkdir -p "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(PKGCONFIGDIR)" + chmod og+rx "$(DESTDIR)$(LIBDIR)" + cp -f "$(UADECORENAME)" "$(DESTDIR)$(LIBDIR)"/ + chmod og+rx "$(DESTDIR)$(LIBDIR)/$(UADECORENAME)" + install ../uade.pc "$(DESTDIR)$(PKGCONFIGDIR)"/ + chmod og+rx "$(DESTDIR)$(PKGCONFIGDIR)" + chmod 644 "$(DESTDIR)$(PKGCONFIGDIR)/uade.pc" # First native builds uade-2.13-fixaudaciousplugin.patch: plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE uade-2.13-fixaudaciousplugin.patch --- --- uade-2.13/src/frontends/audacious/plugin.c.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/frontends/audacious/plugin.c 2010-02-28 21:55:09.213624977 +0800 @@ -85,7 +85,7 @@ .seek = uade_seek, .get_time = uade_get_time, .cleanup = uade_cleanup, - .get_song_info = uade_get_song_info, + /*.get_song_info = uade_get_song_info,*/ .file_info_box = uade_file_info, }; uade-2.13-makenamesane.patch: configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- NEW FILE uade-2.13-makenamesane.patch --- --- uade-2.13/configure.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/configure 2010-02-28 22:04:16.862625017 +0800 @@ -342,8 +342,8 @@ if test -z "$prefix"; then prefix="/usr/local" fi - uadedatadir="$prefix/share/uade2" - uadelibdir="$prefix/lib/uade2" + uadedatadir="$prefix/share/uade" + uadelibdir="$libdir/uade" if test -z "$bindir"; then bindir="$prefix/bin" fi @@ -363,7 +363,7 @@ else # user installation if test -z "$prefix"; then - prefix="$HOME/.uade2" + prefix="$HOME/.uade" fi uadedatadir="$prefix" uadelibdir="$prefix" @@ -439,7 +439,7 @@ fi fi -pkgconfigdir="$prefix/lib/pkgconfig" +pkgconfigdir="$libdir/pkgconfig" rm -f uade.pc if test -n "$PKG_CONFIG" ; then installuadepcrule="" uade-2.13-uade123installdestdir.patch: Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- NEW FILE uade-2.13-uade123installdestdir.patch --- --- uade-2.13/src/frontends/uade123/Makefile.in.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/frontends/uade123/Makefile.in 2010-03-01 22:08:32.925768346 +0800 @@ -19,10 +19,9 @@ rm -f uade123 *.o install: uade123 - mkdir -p "$(BINDIR)" - rm -f "$(BINDIR)/$(UADE123NAME)" - cp -f "$(UADE123NAME)" "$(BINDIR)/" || true - chmod og+rx "$(BINDIR)/$(UADE123NAME)" + mkdir -p "$(DESTDIR)$(BINDIR)" + cp -f "$(UADE123NAME)" "$(DESTDIR)$(BINDIR)/" || true + chmod og+rx "$(DESTDIR)$(BINDIR)/$(UADE123NAME)" uninstall: rm -f "$(BINDIR)/$(UADE123NAME)" uade-2.13-uadefsinstalldestdir.patch: Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE uade-2.13-uadefsinstalldestdir.patch --- --- uade-2.13/src/frontends/uadefs/Makefile.in.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/frontends/uadefs/Makefile.in 2010-03-01 22:19:00.553753871 +0800 @@ -21,9 +21,9 @@ uadefs.o: uadefs.c install: uadefs - mkdir -p "$(BINDIR)" "$(MANDIR)" - install uadefs "$(BINDIR)"/ - install uadefs.1 "$(MANDIR)"/ + mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(MANDIR)/man1" + install uadefs "$(DESTDIR)$(BINDIR)"/ + install uadefs.1 "$(DESTDIR)$(MANDIR)/man1"/ clean: rm -f uadefs *.o uade-2.13-uadeinstalldestdir.patch: Makefile.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- NEW FILE uade-2.13-uadeinstalldestdir.patch --- --- uade-2.13/Makefile.in.orig 2010-03-01 22:20:39.811624361 +0800 +++ uade-2.13/Makefile.in 2010-03-01 22:24:42.093767029 +0800 @@ -59,18 +59,18 @@ src/frontends/uade123/$(UADE123NAME) --basedir=. -S amigasrc/score/score -P players/AbyssHighestExperience songs/AHX.Cruisin -u src/uadecore generalinstall: - mkdir -p "$(DATADIR)" - test -e "$(DATADIR)/uade.conf" || cp -f uade.conf "$(DATADIR)/" - cp -f amigasrc/score/score uaerc eagleplayer.conf "$(DATADIR)/" - cp -rf players "$(DATADIR)/" || true - chmod -R og+rX "$(DATADIR)" - - mkdir -p "$(BINDIR)" - install src/frontends/mod2ogg/mod2ogg2.sh "$(BINDIR)/" - - mkdir -p "$(MANDIR)" - cp doc/uade123.1 "$(MANDIR)"/ - chmod og+r "$(MANDIR)"/uade123.1 + mkdir -p "$(DESTDIR)$(DATADIR)" + test -e "$(DESTDIR)$(DATADIR)/uade.conf" || cp -f uade.conf "$(DESTDIR)$(DATADIR)/" + cp -f amigasrc/score/score uaerc eagleplayer.conf "$(DESTDIR)$(DATADIR)/" + cp -rf players "$(DESTDIR)$(DATADIR)/" || true + chmod -R og+rX "$(DESTDIR)$(DATADIR)" + + mkdir -p "$(DESTDIR)$(BINDIR)" + install src/frontends/mod2ogg/mod2ogg2.sh "$(DESTDIR)$(BINDIR)/" + + mkdir -p "$(DESTDIR)$(MANDIR)/man1" + cp doc/uade123.1 "$(DESTDIR)$(MANDIR)/man1"/ + chmod og+r "$(DESTDIR)$(MANDIR)/man1"/uade123.1 install: generalinstall $(INSTALLED_COMPONENTS) @echo uade-2.13-xmmsinstalldestdir.patch: Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE uade-2.13-xmmsinstalldestdir.patch --- --- uade-2.13/src/frontends/xmms/Makefile.in.orig 2009-10-30 05:01:12.000000000 +0800 +++ uade-2.13/src/frontends/xmms/Makefile.in 2010-03-01 22:12:15.932761082 +0800 @@ -22,9 +22,9 @@ $(OBJCOPY) -G get_iplugin_info $@ install: libuade2.so - mkdir -p "$(XMMSPLUGINDIR)" "$(BINDIR)" - install libuade2.so "$(XMMSPLUGINDIR)" - install uadexmmsadd "$(BINDIR)"/ + mkdir -p "$(DESTDIR)$(XMMSPLUGINDIR)" "$(DESTDIR)$(BINDIR)" + install libuade2.so "$(DESTDIR)$(XMMSPLUGINDIR)" + install uadexmmsadd "$(DESTDIR)$(BINDIR)"/ fileinfo.o: fileinfo.c fileinfo.h $(CC) $(CFLAGS) -c $< Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/uade/F-14/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Sep 2008 11:35:39 -0000 1.2 +++ sources 3 Jan 2011 21:05:20 -0000 1.3 @@ -1 +1 @@ -3c237bc2e4c81601d8f7cb49ac46495d uade-2.09.tar.bz2 +29bb1018b7fa58f93b246264c160bdc6 uade-2.13.tar.bz2 Index: uade.spec =================================================================== RCS file: /cvs/nonfree/rpms/uade/F-14/uade.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- uade.spec 29 Mar 2009 15:19:40 -0000 1.5 +++ uade.spec 3 Jan 2011 21:05:20 -0000 1.6 @@ -1,29 +1,34 @@ -%define _default_patch_fuzz 2 +#%%define _default_patch_fuzz 2 Name: uade -Version: 2.09 -Release: 5%{?dist} -Summary: Unix Amiga Delitracker Emulator +Version: 2.13 +Release: 2%{?dist} +Summary: Unix Amiga DeliTracker Emulator Group: Applications/Multimedia License: GPLv2+ and Distributable URL: http://zakalwe.fi/uade Source0: http://zakalwe.fi/%{name}/uade2/%{name}-%{version}.tar.bz2 Source1: README_%{name}.txt -Patch0: %{name}-2.08-usedestdir.patch -Patch1: %{name}-2.03-makenamesane.patch +Patch0: uade-2.13-makenamesane.patch +Patch1: uade-2.13-fixaudaciousplugin.patch +Patch2: uade-2.13-coreinstalldestdir.patch +Patch3: uade-2.13-uade123installdestdir.patch +Patch4: uade-2.13-xmmsinstalldestdir.patch +Patch5: uade-2.13-audaciousinstalldestdir.patch +Patch6: uade-2.13-uadefsinstalldestdir.patch +Patch7: uade-2.13-uadeinstalldestdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: audacious-devel +BuildRequires: fuse-devel BuildRequires: libao-devel BuildRequires: pkgconfig BuildRequires: xmms-devel - %description UADE plays old Amiga tunes through UAE emulation and a cloned m68k-assembler Eagleplayer API. The player infrastructure of UADE is built on the ground work -of the Eagleplayer and Delitracker projects. UADE makes these external players +of the Eagleplayer and DeliTracker projects. UADE makes these external players reusable on certain UNIX and other platforms. UADE contains a free -(as in freedom) implementation of Eagleplayer and Delitracker API for UNIX +(as in freedom) implementation of Eagleplayer and DeliTracker API for UNIX variants. @@ -39,27 +44,16 @@ %package -n xmms-%{name} -Summary: Unix Amiga Delitracker Emulator XMMS plugin +Summary: Unix Amiga DeliTracker Emulator XMMS plug-in Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} Requires: xmms %description -n xmms-%{name} -A plugin for XMMS that makes use of UADE to play various Amiga music module +A plug-in for XMMS that makes use of UADE to play various Amiga music module formats using external players. -%package -n audacious-plugins-%{name} -Summary: Unix Amiga Delitracker Emulator audacious plugin -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: audacious - -%description -n audacious-plugins-%{name} -A plugin for audacious that makes use of UADE to play various Amiga music -module formats using external players - - %package mod2ogg Summary: Encode music modules to ogg/mp3/flac etc Group: Applications/Multimedia @@ -73,10 +67,27 @@ Encode any music module format into an ogg, mp3, flac, cdr or wav file +%package -n fuse-uadefs +Summary: Pseudo file system for playing music modules as WAVs +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} +Requires: fuse + +%description -n fuse-uadefs +Pseudo file system for playing music modules as WAVs. This allows audio players +which do not support music modules, to play them. + + %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 # Encoding fixes iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv \ @@ -85,16 +96,26 @@ iconv -f iso8859-1 doc/UAE-README -t utf8 > UAE-README.conv \ && mv -f UAE-README.conv doc/UAE-README +# Some renaming to keep things standard +sed -i 's|uade2\/|uade\/|g' doc/uade123.1 +sed -i 's|\.uade2\/|\.uade\/|g' src/frontends/xmms/plugin.c \ + src/frontends/uadefs/uadefs.c src/frontends/uade123/uade123.c \ + src/frontends/common/uadeconf.c src/frontends/common/uadeconf.c +sed -i 's|\/\.uade2|\/\.uade|g' src/frontends/meta-input/uade123.sh + %build -%configure --with-uade123 --with-xmms --with-audacious --with-text-scope +%configure --with-text-scope make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -pm0644 %{SOURCE1} README.dribble +install -pm0644 %{SOURCE1} README.rpmfusion + +# Permission fixes +chmod 644 %{buildroot}%{_mandir}/man1/* # Place configs in a sane location and make symlinks mkdir -p %{buildroot}%{_sysconfdir}/%{name} @@ -116,14 +137,16 @@ %{_libdir}/%{name} %{_mandir}/man1/uade123.1.gz %{_datadir}/%{name} +%dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/eagleplayer.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/uaerc -%doc AUTHORS ChangeLog COPYING COPYING.GPL doc/BUGS doc/UAE-README -%doc doc/UAE-CREDITS doc/PLANS amigasrc/README README.dribble +%doc AUTHORS ChangeLog COPYING COPYING.GPL doc/UAE-README +%doc doc/UAE-CREDITS doc/PLANS amigasrc/README %files mod2ogg +%defattr(-,root,root,-) %{_bindir}/mod2ogg2.sh @@ -138,12 +161,27 @@ %{_libdir}/xmms/Input/libuade2.so -%files -n audacious-plugins-%{name} +%files -n fuse-uadefs %defattr(-,root,root,-) -%{_libdir}/audacious/Input/libuade2.so +%{_bindir}/uadefs +%{_mandir}/man1/uadefs.1.gz %changelog +* Thu Sep 16 2010 Bernie Innocenti <bernie(a)codewiz.org&gt; - 2.13-2 +- Disable audacious plugin + +* Sat Mar 13 2010 Ian Chapman <packages [AT] amiga-hardware [DOT] com> - 2.13-1 +- Upgraded to 2.13 +- Removed some redundant options to %%configure +- Added fuse-devel BR for uadefs +- Updated all patches +- Added missing %%defattr(-,root,root,-) to mod2ogg files section +- Removed some obsolete documentation +- Own /etc/uade +- Added uadefs sub-package, a pseudo file system for representing the modules + as WAV files + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.09-5 - rebuild for new F11 features