rpms/pcsxr/F-15 pcsxr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/pcsxr/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29844/F-15
Modified Files:
.cvsignore sources
Added Files:
pcsxr.spec
Log Message:
Initial Package
--- NEW FILE pcsxr.spec ---
%define svnversion 75200
Name: pcsxr
Version: 1.9.92
Release: 1.20120219svn%{svnversion}%{?dist}
Summary: A plugin based PlayStation (PSX) emulator with high compatibility
#All is GPLv2+ except:
# SOURCE/plugins/gxvideo/* includes some GPLv3+
# SOURCE/libpcsxcore/coff.h is BSD License (no advertising)
# SOURCE/libpcsxcore/sjisfont.h is Public Domain
# SOURCE/libpcsxcore/psemu_plugin_defs.h is Public Domain
License: GPLv3+ and BSD and Public Domain
Url: http://pcsxr.codeplex.com/
#The source can be downloaded here:
#http://pcsxr.codeplex.com/SourceControl/changeset/changes/75200
Source: %{name}-%{svnversion}.zip
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
BuildRequires: nasm
BuildRequires: mesa-libGL-devel
BuildRequires: gettext
BuildRequires: libglade2-devel
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: libcdio-devel
BuildRequires: intltool
BuildRequires: glib2-devel
BuildRequires: libtool
BuildRequires: autoconf
BuildRequires: desktop-file-utils
%description
#modified from debian files
PCSX-Reloaded is an advanced PlayStation (PSX) emulator, which uses a plugin
architecture to provide full support for all components of the PSX. It has full
emulation support for game pads, videos, sound, memory cards, and other
important PSX components, and is able to play many games without problems.
%prep
%setup -q -n %{name}
#remove any unnecessary files:
rm -f -r win32 macosx debian-upstream
%build
sh autogen.sh
%configure --prefix=/usr --enable-libcdio --enable-opengl
make %{?_smp_mflags}
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot}
desktop-file-install \
--remove-key=Encoding \
--dir %{buildroot}%{_datadir}/applications \
data/%{name}.desktop
%find_lang %{name}
%files -f %{name}.lang
%doc doc/keys.txt doc/tweaks.txt AUTHORS COPYING README NEWS
%{_mandir}/man1/%{name}.1*
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}-icon.png
%{_datadir}/psemu
%{_bindir}/%{name}
%{_libdir}/games/psemu
%{_datadir}/applications/%{name}.desktop
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sun Feb 19 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-1.20120219svn75200
- Updated to new SVN checkout version
* Sun Feb 19 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-1.20120219svn75156
- Updated to new SVN checkout version
- Added svn macro
- Removed incorrect disabling of opengl for 64bit
* Wed Feb 8 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-3.20120128svn73976
- Minor source change for convenience.
* Wed Feb 8 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-2.20120128svn73976
- Fixed and optimized source files for size and convenience.
- Added missing file in license breakdown
* Sat Jan 28 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-1.20120128svn73976
- Fixed version number to be more specific
- Fixed inproper license
- Trimmed down the source, removed non-linux code
* Sat Jan 28 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.9.92-1.20120128svn
- Initial package SPEC created
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pcsxr/F-15/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Feb 2012 17:37:29 -0000 1.1
+++ .cvsignore 26 Feb 2012 19:54:57 -0000 1.2
@@ -0,0 +1 @@
+pcsxr-75200.zip
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pcsxr/F-15/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Feb 2012 17:37:29 -0000 1.1
+++ sources 26 Feb 2012 19:54:57 -0000 1.2
@@ -0,0 +1 @@
+12106d2d055a2a12851796dfb621c5fe pcsxr-75200.zip
12 years, 2 months
rpms/mpd/F-16 mpd-0.16.7-default-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mpd.spec, 1.21, 1.22 sources, 1.13, 1.14 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch, 1.1, NONE 95-grant-audio-devices-to-mpd.fdi, 1.1, NONE mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch, 1.1, NONE mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch, 1.1, NONE mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch, 1.1, NONE
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27637/F-16
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd-0.16.7-default-pulseaudio.patch
Removed Files:
6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
95-grant-audio-devices-to-mpd.fdi
mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
Log Message:
Update to 0.16.7 and migrate to systemd.
mpd-0.16.7-default-pulseaudio.patch:
mpdconf.example | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mpd-0.16.7-default-pulseaudio.patch ---
--- doc/mpdconf.example
+++ doc/mpdconf.example
@@ -269,12 +269,12 @@
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
#
-#audio_output {
-# type "pulse"
-# name "My Pulse Output"
+audio_output {
+ type "pulse"
+ name "My Pulse Output"
## server "remote_server" # optional
## sink "remote_server_sink" # optional
-#}
+}
#
## Example "pipe" output:
#
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Oct 2011 19:14:45 -0000 1.13
+++ .cvsignore 26 Feb 2012 19:37:16 -0000 1.14
@@ -1 +1 @@
-mpd-0.16.5.tar.gz
+mpd-0.16.7.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/mpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mpd.spec 12 Oct 2011 19:14:45 -0000 1.21
+++ mpd.spec 26 Feb 2012 19:37:16 -0000 1.22
@@ -1,136 +1,132 @@
-%define _default_patch_fuzz 2
+%global mpd_user mpd
+%global mpd_group %{mpd_user}
+
+%global mpd_homedir %{_localstatedir}/lib/mpd
+%global mpd_logdir %{_localstatedir}/log/mpd
+%global mpd_musicdir %{mpd_homedir}/music
+%global mpd_playlistsdir %{mpd_homedir}/playlists
+
+%global mpd_configfile %{_sysconfdir}/mpd.conf
+%global mpd_dbfile %{mpd_homedir}/mpd.db
+%global mpd_logfile %{mpd_logdir}/mpd.log
+%global mpd_statefile %{mpd_homedir}/mpdstate
Name: mpd
-Version: 0.16.5
+Version: 0.16.7
Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
-Source: http://downloads.sourceforge.net/musicpd/mpd-0.16.5.tar.gz
+
+Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
Source1: mpd.init
-Source2: 95-grant-audio-devices-to-mpd.fdi
-#Patch0: mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
-#Patch1: mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
-#Patch2: mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
-#Patch3: 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libao-devel
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
-BuildRequires: flac-devel
-BuildRequires: audiofile-devel
-BuildRequires: libid3tag-devel
-BuildRequires: mikmod-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: zlib-devel
-BuildRequires: libshout-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: pulseaudio-lib-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: avahi-glib-devel
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: faad2-devel
-BuildRequires: libmad-devel
-BuildRequires: lame-devel
-BuildRequires: ffmpeg-devel
-BuildRequires: wavpack-devel
-BuildRequires: libcurl-devel
-BuildRequires: libmms-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libsidplay-devel
-BuildRequires: bzip2-devel
-BuildRequires: zziplib-devel
-BuildRequires: sqlite-devel
-BuildRequires: autoconf
-BuildRequires: libcue-devel
-Requires(pre): shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig /sbin/service
-Requires(postun): /sbin/service
+Patch0: mpd-0.16.7-default-pulseaudio.patch
-Conflicts: mpich2
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: autoconf
+BuildRequires: avahi-glib-devel
+BuildRequires: bzip2-devel
+BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lame-devel
+BuildRequires: libao-devel
+BuildRequires: libcue-devel
+BuildRequires: libcurl-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libmad-devel
+BuildRequires: libmms-devel
+BuildRequires: libmodplug-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libogg-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libshout-devel
+BuildRequires: libsidplay-devel
+BuildRequires: libvorbis-devel
+BuildRequires: mikmod-devel
+BuildRequires: pulseaudio-lib-devel
+BuildRequires: sqlite-devel
+BuildRequires: wavpack-devel
+BuildRequires: zlib-devel
+BuildRequires: zziplib-devel
+Requires(pre): shadow-utils
+Requires(post): chkconfig
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts
+Conflicts: mpich2
%description
-Music Player Daemon (MPD) allows remote access for playing music (MP3, Ogg
-Vorbis, FLAC, Mod, AAC and wave files) and managing playlists. MPD is designed
-for integrating a computer into a stereo system that provides control for music
-playback over a local network. It is also makes a great desktop music player,
-especially if you are a console junkie, like frontend options or restart X often
+Music Player Daemon (MPD) is a flexible, powerful, server-side application for
+playing music. Through plugins and libraries it can play a variety of sound
+files (e.g., OGG, MP3, FLAC, AAC, WAV) and can be controlled remotely via its
+network protocol. It can be used as a desktop music player, but is also great
+for streaming music to a stereo system over a local network. There are many
+GUI and command-line applications to choose from that act as a front-end for
+browsing and playing your MPD music collection.
%prep
%setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#autoreconf --force --install
+%patch0 -p0
%build
-%configure --enable-mikmod --enable-bzip2 --enable-zip
+%configure --enable-mikmod --enable-bzip2 --enable-zzip
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# conf file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_playlistsdir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/playlists
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/music
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.log
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.error
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.db
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpdstate
-install -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/music,%{_localstatedir}/lib/%{name}/music,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/playlists,%{_localstatedir}/lib/%{name}/playlists,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/log,%{_localstatedir}/lib/%{name}/mpd.log,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/error-log,%{_localstatedir}/lib/%{name}/mpd.error,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/database,%{_localstatedir}/lib/%{name}/mpd.db,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/state,%{_localstatedir}/lib/%{name}/mpdstate,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#state_file,state_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#music_directory,music_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#playlist_directory,playlist_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#db_file,db_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#log_file,log_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e 's,#user.*"nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -e "s,@bindir@,%{_bindir},g;s,@var@,%{_localstatedir},g" %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+touch $RPM_BUILD_ROOT%{mpd_dbfile}
+touch $RPM_BUILD_ROOT%{mpd_logfile}
+touch $RPM_BUILD_ROOT%{mpd_statefile}
+
+install -D -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{mpd_configfile}
+
+sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \
+ -e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \
+ -e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \
+ -e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \
+ -e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \
+ -e 's|#user.*$|user "mpd"|g' \
+ $RPM_BUILD_ROOT%{mpd_configfile}
+
+sed -e "s|@bindir@|%{_bindir}|g" \
+ -e "s|@var@|%{_localstatedir}|g" \
+ %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
%pre
-#creating mpd user
-getent group mpd >/dev/null || groupadd -r mpd
-getent passwd mpd >/dev/null || \
-useradd -r -g mpd -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
- -c "Music Player Daemon" mpd
-# fix for pulseaudio playback (#230)
-usermod -aG pulse-rt mpd
-usermod -aG audio mpd
-exit 0
-
+if [ $1 -eq 1 ]; then
+ getent group %{mpd_group} >/dev/null || groupadd -r %{mpd_group}
+ getent passwd %{mpd_user} >/dev/null || \
+ useradd -r -g %{mpd_group} -d %{mpd_homedir} -s /sbin/nologin \
+ -c "Music Player Daemon" %{mpd_user}
+ gpasswd -a %{mpd_group} audio || :
+ exit 0
+fi
%post
if [ "$1" -eq "1" ]; then
- #register %{name} service
/sbin/chkconfig --add %{name}
else
- # as we switched from running as root.root to mpd.mpd
- # chown the db files and playlists on upgrades
- chown -R mpd.mpd %{_localstatedir}/lib/%{name}/playlists > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.log > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.error > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.db > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpdstate > /dev/null 2>&1 ||:
+ # as we switched from running as root.root to mpd.mpd
+ # chown the db files and playlists on upgrades
+ chown -R %{mpd_user}.%{mpd_group} \
+ %{mpd_playlistsdir} > /dev/null 2>&1 ||:
+ chown %{mpd_user}.%{mpd_group} \
+ %{mpd_dbfile} > /dev/null 2>&1 ||:
+ chown %{mpd_user}.%{mpd_group} \
+ %{mpd_logfile} > /dev/null 2>&1 ||:
+ chown %{mpd_user}.%{mpd_group} \
+ %{mpd_statefile} > /dev/null 2>&1 ||:
fi
%preun
@@ -145,24 +141,34 @@
fi
%files
-%defattr(-,root,root)
%doc README UPGRADING AUTHORS COPYING
%{_bindir}/%name
%attr(755,root,root) %{_initrddir}/%{name}
%{_mandir}/man1/*
%{_mandir}/man5/*
-%{_datadir}/hal/fdi/policy/20thirdparty/*fdi
-%defattr(-,mpd,mpd)
%config(noreplace) %{_sysconfdir}/mpd.conf
-%dir %{_localstatedir}/lib/%{name}
-%{_localstatedir}/lib/%{name}/playlists
-%{_localstatedir}/lib/%{name}/music
-%ghost %{_localstatedir}/lib/%{name}/mpd.log
-%ghost %{_localstatedir}/lib/%{name}/mpd.error
-%ghost %{_localstatedir}/lib/%{name}/mpd.db
-%ghost %{_localstatedir}/lib/%{name}/mpdstate
+
+%defattr(-,%{mpd_user},%{mpd_group})
+%dir %{mpd_homedir}
+%dir %{mpd_musicdir}
+%dir %{mpd_playlistsdir}
+%ghost %{mpd_dbfile}
+%ghost %{mpd_logfile}
+%ghost %{mpd_statefile}
%changelog
+* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+- update to upstream release 0.16.7
+- add convenient global variables
+- change incorrect --enable-zip to --enable-zzip
+- change default log file location to /var/log/mpd/mpd.log
+- change default audio output to pulseaudio
+- remove obsolete BuildRoot tag, %%clean section and %%defattr
+- remove obsolete mpd-error file
+- remove obsolete hal fdi file
+- do not add mpd to pulse-rt group as system mode is not recommended by
+ pulseaudio upstream, and the group no longer exists
+
* Wed Oct 12 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.16.5-1
- Update to latest upstream release (#1954)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Oct 2011 19:14:45 -0000 1.13
+++ sources 26 Feb 2012 19:37:16 -0000 1.14
@@ -1 +1 @@
-5fb4c97623eca26d2d8b968868e2f13f mpd-0.16.5.tar.gz
+3d0e7c36646e80386b32966bd4268e8d mpd-0.16.7.tar.bz2
--- 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch DELETED ---
--- 95-grant-audio-devices-to-mpd.fdi DELETED ---
--- mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch DELETED ---
--- mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch DELETED ---
--- mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch DELETED ---
12 years, 2 months
rpms/mpd/F-17 mpd-0.16.7-default-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mpd.spec, 1.22, 1.23 sources, 1.13, 1.14 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch, 1.1, NONE 95-grant-audio-devices-to-mpd.fdi, 1.1, NONE mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch, 1.1, NONE mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch, 1.1, NONE mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch, 1.1, NONE mpd.init, 1.1, NONE
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24311/F-17
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd-0.16.7-default-pulseaudio.patch
Removed Files:
6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
95-grant-audio-devices-to-mpd.fdi
mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
mpd.init
Log Message:
Update to 0.16.7 and migrate to systemd.
mpd-0.16.7-default-pulseaudio.patch:
mpdconf.example | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mpd-0.16.7-default-pulseaudio.patch ---
--- doc/mpdconf.example
+++ doc/mpdconf.example
@@ -269,12 +269,12 @@
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
#
-#audio_output {
-# type "pulse"
-# name "My Pulse Output"
+audio_output {
+ type "pulse"
+ name "My Pulse Output"
## server "remote_server" # optional
## sink "remote_server_sink" # optional
-#}
+}
#
## Example "pipe" output:
#
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/F-17/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Oct 2011 19:14:45 -0000 1.13
+++ .cvsignore 26 Feb 2012 19:12:15 -0000 1.14
@@ -1 +1 @@
-mpd-0.16.5.tar.gz
+mpd-0.16.7.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-17/mpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mpd.spec 25 Jan 2012 14:52:43 -0000 1.22
+++ mpd.spec 26 Feb 2012 19:12:15 -0000 1.23
@@ -1,170 +1,178 @@
-%define _default_patch_fuzz 2
+%global mpd_user mpd
+%global mpd_group %{mpd_user}
+
+%global mpd_homedir %{_localstatedir}/lib/mpd
+%global mpd_logdir %{_localstatedir}/log/mpd
+%global mpd_musicdir %{mpd_homedir}/music
+%global mpd_playlistsdir %{mpd_homedir}/playlists
+
+%global mpd_configfile %{_sysconfdir}/mpd.conf
+%global mpd_dbfile %{mpd_homedir}/mpd.db
+%global mpd_logfile %{mpd_logdir}/mpd.log
+%global mpd_statefile %{mpd_homedir}/mpdstate
Name: mpd
-Version: 0.16.5
+Epoch: 1
+Version: 0.16.7
Release: 2%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
-Source: http://downloads.sourceforge.net/musicpd/mpd-0.16.5.tar.gz
-Source1: mpd.init
-Source2: 95-grant-audio-devices-to-mpd.fdi
-#Patch0: mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
-#Patch1: mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
-#Patch2: mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
-#Patch3: 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libao-devel
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
-BuildRequires: flac-devel
-BuildRequires: audiofile-devel
-BuildRequires: libid3tag-devel
-BuildRequires: mikmod-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: zlib-devel
-BuildRequires: libshout-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: pulseaudio-lib-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: avahi-glib-devel
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: faad2-devel
-BuildRequires: libmad-devel
-BuildRequires: lame-devel
-BuildRequires: ffmpeg-devel
-BuildRequires: wavpack-devel
-BuildRequires: libcurl-devel
-BuildRequires: libmms-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libsidplay-devel
-BuildRequires: bzip2-devel
-BuildRequires: zziplib-devel
-BuildRequires: sqlite-devel
-BuildRequires: autoconf
-BuildRequires: libcue-devel
-Requires(pre): shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig /sbin/service
-Requires(postun): /sbin/service
-Conflicts: mpich2
+Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Patch0: mpd-0.16.7-default-pulseaudio.patch
+
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: autoconf
+BuildRequires: avahi-glib-devel
+BuildRequires: bzip2-devel
+BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lame-devel
+BuildRequires: libao-devel
+BuildRequires: libcue-devel
+BuildRequires: libcurl-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libmad-devel
+BuildRequires: libmms-devel
+BuildRequires: libmodplug-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libogg-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libshout-devel
+BuildRequires: libsidplay-devel
+BuildRequires: libvorbis-devel
+BuildRequires: mikmod-devel
+BuildRequires: pulseaudio-lib-devel
+BuildRequires: sqlite-devel
+BuildRequires: wavpack-devel
+BuildRequires: zlib-devel
+BuildRequires: zziplib-devel
+BuildRequires: systemd-units
+Requires(pre): shadow-utils
+Requires(post): chkconfig, systemd-units
+Requires(preun): chkconfig, initscripts, systemd-units
+Requires(postun): initscripts, systemd-units
+Conflicts: mpich2
%description
-Music Player Daemon (MPD) allows remote access for playing music (MP3, Ogg
-Vorbis, FLAC, Mod, AAC and wave files) and managing playlists. MPD is designed
-for integrating a computer into a stereo system that provides control for music
-playback over a local network. It is also makes a great desktop music player,
-especially if you are a console junkie, like frontend options or restart X often
+Music Player Daemon (MPD) is a flexible, powerful, server-side application for
+playing music. Through plugins and libraries it can play a variety of sound
+files (e.g., OGG, MP3, FLAC, AAC, WAV) and can be controlled remotely via its
+network protocol. It can be used as a desktop music player, but is also great
+for streaming music to a stereo system over a local network. There are many
+GUI and command-line applications to choose from that act as a front-end for
+browsing and playing your MPD music collection.
+
%prep
%setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#autoreconf --force --install
+%patch0 -p0
%build
-%configure --enable-mikmod --enable-bzip2 --enable-zip
+%{configure} --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-bzip2 --enable-mikmod --enable-zzip
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# conf file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/playlists
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/music
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.log
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.error
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.db
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpdstate
-install -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/music,%{_localstatedir}/lib/%{name}/music,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/playlists,%{_localstatedir}/lib/%{name}/playlists,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/log,%{_localstatedir}/lib/%{name}/mpd.log,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/error-log,%{_localstatedir}/lib/%{name}/mpd.error,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/database,%{_localstatedir}/lib/%{name}/mpd.db,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/state,%{_localstatedir}/lib/%{name}/mpdstate,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#state_file,state_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#music_directory,music_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#playlist_directory,playlist_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#db_file,db_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#log_file,log_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e 's,#user.*"nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -e "s,@bindir@,%{_bindir},g;s,@var@,%{_localstatedir},g" %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_playlistsdir}
+touch $RPM_BUILD_ROOT%{mpd_dbfile}
+touch $RPM_BUILD_ROOT%{mpd_logfile}
+touch $RPM_BUILD_ROOT%{mpd_statefile}
+
+install -D -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{mpd_configfile}
+sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \
+ -e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \
+ -e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \
+ -e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \
+ -e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \
+ -e 's|#user.*$|user "mpd"|g' \
+ $RPM_BUILD_ROOT%{mpd_configfile}
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
-%clean
-rm -rf $RPM_BUILD_ROOT
%pre
-#creating mpd user
-getent group mpd >/dev/null || groupadd -r mpd
-getent passwd mpd >/dev/null || \
-useradd -r -g mpd -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
- -c "Music Player Daemon" mpd
-# fix for pulseaudio playback (#230)
-usermod -aG pulse-rt mpd
-usermod -aG audio mpd
-exit 0
-
+if [ $1 -eq 1 ]; then
+ getent group %{mpd_group} >/dev/null || groupadd -r %{mpd_group}
+ getent passwd %{mpd_user} >/dev/null || \
+ useradd -r -g %{mpd_group} -d %{mpd_homedir} \
+ -s /sbin/nologin -c "Music Player Daemon" %{mpd_user}
+ gpasswd -a %{mpd_group} audio || :
+ exit 0
+fi
%post
-if [ "$1" -eq "1" ]; then
- #register %{name} service
- /sbin/chkconfig --add %{name}
-else
- # as we switched from running as root.root to mpd.mpd
- # chown the db files and playlists on upgrades
- chown -R mpd.mpd %{_localstatedir}/lib/%{name}/playlists > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.log > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.error > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.db > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpdstate > /dev/null 2>&1 ||:
+if [ $1 -eq 1 ]; then
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+%triggerun -- mpd < 1:0.16.7-2
+if /sbin/chkconfig --level 3 mpd; then
+ /bin/systemctl enable mpd.service >/dev/null 2>&1 || :
+fi
+/sbin/chkconfig --del mpd >/dev/null 2>&1 || :
+/bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
+
%preun
-if [ "$1" -eq "0" ]; then
- /sbin/service %{name} stop > /dev/null 2>&1
- /sbin/chkconfig --del %{name}
+if [ $1 -eq 0 ]; then
+ /bin/systemctl --no-reload disable mpd.service >/dev/null 2>&1 || :
+ /bin/systemctl stop mpd.service >/dev/null 2>&1 || :
fi
%postun
-if [ "$1" -eq "1" ]; then
- /sbin/service %{name} condrestart > /dev/null 2>&1
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ /bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
fi
+
%files
-%defattr(-,root,root)
-%doc README UPGRADING AUTHORS COPYING
-%{_bindir}/%name
-%attr(755,root,root) %{_initrddir}/%{name}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_datadir}/hal/fdi/policy/20thirdparty/*fdi
-%defattr(-,mpd,mpd)
-%config(noreplace) %{_sysconfdir}/mpd.conf
-%dir %{_localstatedir}/lib/%{name}
-%{_localstatedir}/lib/%{name}/playlists
-%{_localstatedir}/lib/%{name}/music
-%ghost %{_localstatedir}/lib/%{name}/mpd.log
-%ghost %{_localstatedir}/lib/%{name}/mpd.error
-%ghost %{_localstatedir}/lib/%{name}/mpd.db
-%ghost %{_localstatedir}/lib/%{name}/mpdstate
+%doc AUTHORS COPYING README UPGRADING
+%{_bindir}/%{name}
+%{_mandir}/man1/mpd.1*
+%{_mandir}/man5/mpd.conf.5*
+%{_unitdir}/mpd.service
+%config(noreplace) %{mpd_configfile}
+
+%defattr(-,%{mpd_user},%{mpd_group})
+%dir %{mpd_homedir}
+%dir %{mpd_musicdir}
+%dir %{mpd_playlistsdir}
+%ghost %{mpd_dbfile}
+%ghost %{mpd_logfile}
+%ghost %{mpd_statefile}
+
%changelog
-* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.16.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
+- do not add mpd to pulse-rt group as system mode is not recommended by
+ pulseaudio upstream, and the group no longer exists
+- add triggerun and systemd scriptlets
+- add Epoch (for triggerun scriptlet) to allow updates to F16
+- change default audio output to pulseaudio
+
+* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+- update to 0.16.7
+
+* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+- update to 0.16.6
+- add convenient global variables
+- add systemd unit file instead of initscript
+- change incorrect --enable-zip to --enable-zzip
+- change default log file location to /var/log/mpd/mpd.log
+- remove obsolete mpd error-log
+- remove obsolete hal fdi file
* Wed Oct 12 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.16.5-1
- Update to latest upstream release (#1954)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/F-17/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Oct 2011 19:14:45 -0000 1.13
+++ sources 26 Feb 2012 19:12:15 -0000 1.14
@@ -1 +1 @@
-5fb4c97623eca26d2d8b968868e2f13f mpd-0.16.5.tar.gz
+3d0e7c36646e80386b32966bd4268e8d mpd-0.16.7.tar.bz2
--- 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch DELETED ---
--- 95-grant-audio-devices-to-mpd.fdi DELETED ---
--- mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch DELETED ---
--- mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch DELETED ---
--- mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch DELETED ---
--- mpd.init DELETED ---
12 years, 2 months
rpms/mpd/devel mpd-0.16.7-default-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mpd.spec, 1.22, 1.23 sources, 1.13, 1.14 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch, 1.1, NONE 95-grant-audio-devices-to-mpd.fdi, 1.1, NONE mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch, 1.1, NONE mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch, 1.1, NONE mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch, 1.1, NONE mpd.init, 1.1, NONE
by Jamie Nguyen
Author: jamielinux
Update of /cvs/free/rpms/mpd/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23310/devel
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd-0.16.7-default-pulseaudio.patch
Removed Files:
6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
95-grant-audio-devices-to-mpd.fdi
mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
mpd.init
Log Message:
Update to 0.16.7 and migrate to systemd.
mpd-0.16.7-default-pulseaudio.patch:
mpdconf.example | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mpd-0.16.7-default-pulseaudio.patch ---
--- doc/mpdconf.example
+++ doc/mpdconf.example
@@ -269,12 +269,12 @@
#
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
#
-#audio_output {
-# type "pulse"
-# name "My Pulse Output"
+audio_output {
+ type "pulse"
+ name "My Pulse Output"
## server "remote_server" # optional
## sink "remote_server_sink" # optional
-#}
+}
#
## Example "pipe" output:
#
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Oct 2011 19:14:45 -0000 1.13
+++ .cvsignore 26 Feb 2012 19:06:52 -0000 1.14
@@ -1 +1 @@
-mpd-0.16.5.tar.gz
+mpd-0.16.7.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mpd.spec 25 Jan 2012 14:52:43 -0000 1.22
+++ mpd.spec 26 Feb 2012 19:06:52 -0000 1.23
@@ -1,170 +1,178 @@
-%define _default_patch_fuzz 2
+%global mpd_user mpd
+%global mpd_group %{mpd_user}
+
+%global mpd_homedir %{_localstatedir}/lib/mpd
+%global mpd_logdir %{_localstatedir}/log/mpd
+%global mpd_musicdir %{mpd_homedir}/music
+%global mpd_playlistsdir %{mpd_homedir}/playlists
+
+%global mpd_configfile %{_sysconfdir}/mpd.conf
+%global mpd_dbfile %{mpd_homedir}/mpd.db
+%global mpd_logfile %{mpd_logdir}/mpd.log
+%global mpd_statefile %{mpd_homedir}/mpdstate
Name: mpd
-Version: 0.16.5
+Epoch: 1
+Version: 0.16.7
Release: 2%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
-Source: http://downloads.sourceforge.net/musicpd/mpd-0.16.5.tar.gz
-Source1: mpd.init
-Source2: 95-grant-audio-devices-to-mpd.fdi
-#Patch0: mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
-#Patch1: mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
-#Patch2: mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
-#Patch3: 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libao-devel
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
-BuildRequires: flac-devel
-BuildRequires: audiofile-devel
-BuildRequires: libid3tag-devel
-BuildRequires: mikmod-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: zlib-devel
-BuildRequires: libshout-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: pulseaudio-lib-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: avahi-glib-devel
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: faad2-devel
-BuildRequires: libmad-devel
-BuildRequires: lame-devel
-BuildRequires: ffmpeg-devel
-BuildRequires: wavpack-devel
-BuildRequires: libcurl-devel
-BuildRequires: libmms-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libsidplay-devel
-BuildRequires: bzip2-devel
-BuildRequires: zziplib-devel
-BuildRequires: sqlite-devel
-BuildRequires: autoconf
-BuildRequires: libcue-devel
-Requires(pre): shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig /sbin/service
-Requires(postun): /sbin/service
-Conflicts: mpich2
+Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Patch0: mpd-0.16.7-default-pulseaudio.patch
+
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: autoconf
+BuildRequires: avahi-glib-devel
+BuildRequires: bzip2-devel
+BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lame-devel
+BuildRequires: libao-devel
+BuildRequires: libcue-devel
+BuildRequires: libcurl-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libmad-devel
+BuildRequires: libmms-devel
+BuildRequires: libmodplug-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libogg-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libshout-devel
+BuildRequires: libsidplay-devel
+BuildRequires: libvorbis-devel
+BuildRequires: mikmod-devel
+BuildRequires: pulseaudio-lib-devel
+BuildRequires: sqlite-devel
+BuildRequires: wavpack-devel
+BuildRequires: zlib-devel
+BuildRequires: zziplib-devel
+BuildRequires: systemd-units
+Requires(pre): shadow-utils
+Requires(post): chkconfig, systemd-units
+Requires(preun): chkconfig, initscripts, systemd-units
+Requires(postun): initscripts, systemd-units
+Conflicts: mpich2
%description
-Music Player Daemon (MPD) allows remote access for playing music (MP3, Ogg
-Vorbis, FLAC, Mod, AAC and wave files) and managing playlists. MPD is designed
-for integrating a computer into a stereo system that provides control for music
-playback over a local network. It is also makes a great desktop music player,
-especially if you are a console junkie, like frontend options or restart X often
+Music Player Daemon (MPD) is a flexible, powerful, server-side application for
+playing music. Through plugins and libraries it can play a variety of sound
+files (e.g., OGG, MP3, FLAC, AAC, WAV) and can be controlled remotely via its
+network protocol. It can be used as a desktop music player, but is also great
+for streaming music to a stereo system over a local network. There are many
+GUI and command-line applications to choose from that act as a front-end for
+browsing and playing your MPD music collection.
+
%prep
%setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#autoreconf --force --install
+%patch0 -p0
%build
-%configure --enable-mikmod --enable-bzip2 --enable-zip
+%{configure} --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-bzip2 --enable-mikmod --enable-zzip
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# conf file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/playlists
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/music
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.log
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.error
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.db
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpdstate
-install -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/music,%{_localstatedir}/lib/%{name}/music,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/playlists,%{_localstatedir}/lib/%{name}/playlists,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/log,%{_localstatedir}/lib/%{name}/mpd.log,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/error-log,%{_localstatedir}/lib/%{name}/mpd.error,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/database,%{_localstatedir}/lib/%{name}/mpd.db,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/state,%{_localstatedir}/lib/%{name}/mpdstate,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#state_file,state_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#music_directory,music_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#playlist_directory,playlist_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#db_file,db_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#log_file,log_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e 's,#user.*"nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -e "s,@bindir@,%{_bindir},g;s,@var@,%{_localstatedir},g" %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_playlistsdir}
+touch $RPM_BUILD_ROOT%{mpd_dbfile}
+touch $RPM_BUILD_ROOT%{mpd_logfile}
+touch $RPM_BUILD_ROOT%{mpd_statefile}
+
+install -D -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{mpd_configfile}
+sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \
+ -e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \
+ -e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \
+ -e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \
+ -e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \
+ -e 's|#user.*$|user "mpd"|g' \
+ $RPM_BUILD_ROOT%{mpd_configfile}
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
-%clean
-rm -rf $RPM_BUILD_ROOT
%pre
-#creating mpd user
-getent group mpd >/dev/null || groupadd -r mpd
-getent passwd mpd >/dev/null || \
-useradd -r -g mpd -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
- -c "Music Player Daemon" mpd
-# fix for pulseaudio playback (#230)
-usermod -aG pulse-rt mpd
-usermod -aG audio mpd
-exit 0
-
+if [ $1 -eq 1 ]; then
+ getent group %{mpd_group} >/dev/null || groupadd -r %{mpd_group}
+ getent passwd %{mpd_user} >/dev/null || \
+ useradd -r -g %{mpd_group} -d %{mpd_homedir} \
+ -s /sbin/nologin -c "Music Player Daemon" %{mpd_user}
+ gpasswd -a %{mpd_group} audio || :
+ exit 0
+fi
%post
-if [ "$1" -eq "1" ]; then
- #register %{name} service
- /sbin/chkconfig --add %{name}
-else
- # as we switched from running as root.root to mpd.mpd
- # chown the db files and playlists on upgrades
- chown -R mpd.mpd %{_localstatedir}/lib/%{name}/playlists > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.log > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.error > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.db > /dev/null 2>&1 ||:
- chown mpd.mpd %{_localstatedir}/lib/%{name}/mpdstate > /dev/null 2>&1 ||:
+if [ $1 -eq 1 ]; then
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+%triggerun -- mpd < 1:0.16.7-2
+if /sbin/chkconfig --level 3 mpd; then
+ /bin/systemctl enable mpd.service >/dev/null 2>&1 || :
+fi
+/sbin/chkconfig --del mpd >/dev/null 2>&1 || :
+/bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
+
%preun
-if [ "$1" -eq "0" ]; then
- /sbin/service %{name} stop > /dev/null 2>&1
- /sbin/chkconfig --del %{name}
+if [ $1 -eq 0 ]; then
+ /bin/systemctl --no-reload disable mpd.service >/dev/null 2>&1 || :
+ /bin/systemctl stop mpd.service >/dev/null 2>&1 || :
fi
%postun
-if [ "$1" -eq "1" ]; then
- /sbin/service %{name} condrestart > /dev/null 2>&1
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ /bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
fi
+
%files
-%defattr(-,root,root)
-%doc README UPGRADING AUTHORS COPYING
-%{_bindir}/%name
-%attr(755,root,root) %{_initrddir}/%{name}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_datadir}/hal/fdi/policy/20thirdparty/*fdi
-%defattr(-,mpd,mpd)
-%config(noreplace) %{_sysconfdir}/mpd.conf
-%dir %{_localstatedir}/lib/%{name}
-%{_localstatedir}/lib/%{name}/playlists
-%{_localstatedir}/lib/%{name}/music
-%ghost %{_localstatedir}/lib/%{name}/mpd.log
-%ghost %{_localstatedir}/lib/%{name}/mpd.error
-%ghost %{_localstatedir}/lib/%{name}/mpd.db
-%ghost %{_localstatedir}/lib/%{name}/mpdstate
+%doc AUTHORS COPYING README UPGRADING
+%{_bindir}/%{name}
+%{_mandir}/man1/mpd.1*
+%{_mandir}/man5/mpd.conf.5*
+%{_unitdir}/mpd.service
+%config(noreplace) %{mpd_configfile}
+
+%defattr(-,%{mpd_user},%{mpd_group})
+%dir %{mpd_homedir}
+%dir %{mpd_musicdir}
+%dir %{mpd_playlistsdir}
+%ghost %{mpd_dbfile}
+%ghost %{mpd_logfile}
+%ghost %{mpd_statefile}
+
%changelog
-* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.16.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
+- do not add mpd to pulse-rt group as system mode is not recommended by
+ pulseaudio upstream, and the group no longer exists
+- add triggerun and systemd scriptlets
+- add Epoch (for triggerun scriptlet) to allow updates to F16
+- change default audio output to pulseaudio
+
+* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+- update to 0.16.7
+
+* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+- update to 0.16.6
+- add convenient global variables
+- add systemd unit file instead of initscript
+- change incorrect --enable-zip to --enable-zzip
+- change default log file location to /var/log/mpd/mpd.log
+- remove obsolete mpd error-log
+- remove obsolete hal fdi file
* Wed Oct 12 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.16.5-1
- Update to latest upstream release (#1954)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Oct 2011 19:14:45 -0000 1.13
+++ sources 26 Feb 2012 19:06:52 -0000 1.14
@@ -1 +1 @@
-5fb4c97623eca26d2d8b968868e2f13f mpd-0.16.5.tar.gz
+3d0e7c36646e80386b32966bd4268e8d mpd-0.16.7.tar.bz2
--- 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch DELETED ---
--- 95-grant-audio-devices-to-mpd.fdi DELETED ---
--- mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch DELETED ---
--- mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch DELETED ---
--- mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch DELETED ---
--- mpd.init DELETED ---
12 years, 2 months
rpms/pcsxr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/pcsxr/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw11362/rpms/pcsxr/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module pcsxr
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: pcsxr
# $Id: Makefile,v 1.1 2012/02/26 17:37:29 kwizart Exp $
NAME := pcsxr
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 2 months
rpms/pcsxr Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/pcsxr
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw11362/rpms/pcsxr
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module pcsxr
--- NEW FILE Makefile ---
# Top level Makefile for module pcsxr
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
12 years, 2 months
rpms/pcsxr/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/pcsxr/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw11362/rpms/pcsxr/devel
Log Message:
Directory /cvs/free/rpms/pcsxr/devel added to the repository
12 years, 2 months
rpms/pcsxr - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/pcsxr
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsw11362/rpms/pcsxr
Log Message:
Directory /cvs/free/rpms/pcsxr added to the repository
12 years, 2 months
rpms/openshot/F-17 openshot.spec,1.6,1.7
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28100
Modified Files:
openshot.spec
Log Message:
* Mon Feb 20 2012 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.2-4
- Fix small packaging bug with icon.
Index: openshot.spec
===================================================================
RCS file: /cvs/free/rpms/openshot/F-17/openshot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openshot.spec 8 Feb 2012 21:54:24 -0000 1.6
+++ openshot.spec 26 Feb 2012 15:21:27 -0000 1.7
@@ -1,6 +1,6 @@
Name: openshot
Version: 1.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A GTK based non-linear video editor
Group: Applications/Multimedia
@@ -105,14 +105,21 @@
%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
-
%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files -f %{name}.lang
%doc AUTHORS COPYING README
@@ -141,6 +148,9 @@
%changelog
+* Mon Feb 20 2012 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.2-4
+- Fix small packaging bug with icon.
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
rpms/mame/F-15 .cvsignore, 1.50, 1.51 mame.spec, 1.58, 1.59 sources, 1.50, 1.51 mame-disable-ldtools.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26539
Modified Files:
.cvsignore mame.spec sources
Removed Files:
mame-disable-ldtools.patch
Log Message:
* Sun Feb 26 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u2-1
- Updated to 0.145u2
- Re-enabled ldresample and ldverify
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 19 Feb 2012 19:44:57 -0000 1.50
+++ .cvsignore 26 Feb 2012 15:09:46 -0000 1.51
@@ -1,2 +1,3 @@
mame0145s.exe
0145u1_diff.zip
+0145u2_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mame.spec 19 Feb 2012 19:44:57 -0000 1.58
+++ mame.spec 26 Feb 2012 15:09:46 -0000 1.59
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 145
-%global sourceupdate 1
+%global sourceupdate 2
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
@@ -35,7 +35,6 @@
Patch0: %{name}-fortify.patch
Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
-Patch3: %{name}-disable-ldtools.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -109,7 +108,6 @@
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
-%patch3 -p1 -b .disable-ldtools
# Create ini file
cat > %{name}.ini << EOF
@@ -199,8 +197,7 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-#install -pm 755 chdman jedutil ldresample ldverify \
-install -pm 755 chdman jedutil \
+install -pm 755 chdman jedutil ldresample ldverify \
romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
#for tool in regrep runtest split src2html srcclean
for tool in regrep split src2html srcclean
@@ -236,8 +233,8 @@
%files tools
%{_bindir}/chdman
%{_bindir}/jedutil
-#%{_bindir}/ldresample
-#%{_bindir}/ldverify
+%{_bindir}/ldresample
+%{_bindir}/ldverify
%{_bindir}/%{name}-regrep
%{_bindir}/romcmp
#%{_bindir}/%{name}-runtest
@@ -260,6 +257,10 @@
%changelog
+* Sun Feb 26 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u2-1
+- Updated to 0.145u2
+- Re-enabled ldresample and ldverify
+
* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u1-1
- Updated to 0.145u1
- Added artwork/* and hlsl/* to the installed files
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 19 Feb 2012 19:44:57 -0000 1.50
+++ sources 26 Feb 2012 15:09:46 -0000 1.51
@@ -1,2 +1,3 @@
4514ecf6dc5331cd0e803704f95e206f mame0145s.exe
2b555a2fda60eac45743bbef3ef0481d 0145u1_diff.zip
+cf2b866a1ba7f537c011328b727a6f5b 0145u2_diff.zip
--- mame-disable-ldtools.patch DELETED ---
12 years, 2 months