6:33 p.m.
Author: jamielinux
Update of /cvs/free/rpms/mpd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7860/devel
Modified Files:
.cvsignore mpd.spec sources
Added Files:
mpd.logrotate
Log Message:
Update to upstream release 0.17.3 and various fixes
--- NEW FILE mpd.logrotate ---
/var/log/mpd/*.log {
weekly
missingok
rotate 7
compress
notifempty
copytruncate
create 600
}
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 9 Apr 2012 15:47:40 -0000 1.15
+++ .cvsignore 23 Feb 2013 18:33:26 -0000 1.16
@@ -1 +1 @@
-mpd-0.16.8.tar.bz2
+mpd-0.17.3.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mpd.spec 30 Jan 2013 16:55:04 -0000 1.31
+++ mpd.spec 23 Feb 2013 18:33:26 -0000 1.32
@@ -15,14 +15,15 @@
Name: mpd
Epoch: 1
-Version: 0.16.8
-Release: 7%{?dist}
+Version: 0.17.3
+Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+Source1: mpd.logrotate
Patch0: mpd-0.16.7-default-pulseaudio.patch
BuildRequires: alsa-lib-devel
@@ -36,7 +37,6 @@
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lame-devel
BuildRequires: libao-devel
-BuildRequires: libcue-devel
BuildRequires: libcurl-devel
BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
@@ -45,7 +45,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
-BuildRequires: libshout-devel
+BuildRequires: libshout-devel
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel
BuildRequires: pkgconfig(libpulse)
@@ -55,9 +55,9 @@
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
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
Conflicts: mpich2
%description
@@ -75,7 +75,6 @@
%patch0 -p0
%build
-sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in
%{configure} \
--with-systemdsystemunitdir=%{_unitdir} \
--enable-bzip2 \
@@ -87,6 +86,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+install -p -D -m 0644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -118,35 +120,13 @@
fi
%post
-if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-else
- # 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_homedir} > /dev/null 2>&1 ||:
- chown -R %{mpd_user}.%{mpd_group} \
- %{mpd_logdir} > /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 || :
+%systemd_post mpd.service
%preun
-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
+%systemd_preun mpd.service
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
- /bin/systemctl try-restart mpd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart mpd.service
%files
@@ -156,6 +136,7 @@
%{_mandir}/man5/mpd.conf.5*
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
+%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
@@ -168,8 +149,11 @@
%changelog
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-7
-- Rebuilt for ffmpeg
+* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.17.3-1
+- update to upstream release 0.17.3
+- new CUE parser so remove libcue from BuildRequires
+- update systemd scriptlets and remove chkconfig from the Requires
+- add a logrotate file
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-6
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 9 Apr 2012 15:47:40 -0000 1.15
+++ sources 23 Feb 2013 18:33:26 -0000 1.16
@@ -1 +1 @@
-b412a9d0b3457bea1bb87904a8f80c04 mpd-0.16.8.tar.bz2
+cfc9dbf54f52569b998677fe1fa79c11 mpd-0.17.3.tar.bz2