[vdr] Specfile cleanups.
Ville Skyttä
scop at fedoraproject.org
Tue Jan 7 21:54:30 UTC 2014
commit bc3b51be1d5e0808869882d5f10571cca200bf43
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue Jan 7 00:01:48 2014 +0200
Specfile cleanups.
vdr.spec | 116 +++++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 53 deletions(-)
---
diff --git a/vdr.spec b/vdr.spec
index 73a42f7..046fbf9 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -101,7 +101,6 @@ Requires: util-linux >= 2.15
Requires: font(:lang=en)
# shadow-utils >= 4.1.1 for useradd -N
Requires(pre): shadow-utils >= 2:4.1.1
-Requires(post): shadow-utils
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -182,12 +181,12 @@ patch -F 0 -i debian/patches/12_osdbase-maxitems.patch
%patch2 -p1
%patch3 -p1
sed \
- -e 's|__CACHEDIR__|%{cachedir}|' \
- -e 's|__CONFIGDIR__|%{configdir}|' \
- -e 's|__PLUGINDIR__|%{plugindir}|' \
- -e 's|__VARDIR__|%{vardir}|' \
- -e 's|__VIDEODIR__|%{videodir}|' \
- %{PATCH4} | %{__patch} -p1
+ -e 's|__CACHEDIR__|%{cachedir}|' \
+ -e 's|__CONFIGDIR__|%{configdir}|' \
+ -e 's|__PLUGINDIR__|%{plugindir}|' \
+ -e 's|__VARDIR__|%{vardir}|' \
+ -e 's|__VIDEODIR__|%{videodir}|' \
+ %{PATCH4} | %{__patch} -p1
%patch5 -p1 -F 2
# TODO: does not apply
#patch6 -p0
@@ -206,8 +205,8 @@ sed \
%patch18 -p1
for f in CONTRIBUTORS HISTORY UPDATE-1.4.0 README.timer-info \
- PLUGINS/src/dvbhddevice/HISTORY; do
- iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
+ PLUGINS/src/dvbhddevice/HISTORY; do
+ iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
done
cp -p %{SOURCE5} reccmds.conf
@@ -319,39 +318,52 @@ touch $RPM_BUILD_ROOT%{vardir}/themes/{classic,sttng}-default.theme
install -pm 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/runvdr
sed -i \
- -e 's|/usr/sbin/|%{_sbindir}/|' \
- -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|g' \
- -e 's|/usr/lib/vdr\b|%{plugindir}|' \
- -e 's|VDR_PLUGIN_VERSION|%{apiver}|' \
- $RPM_BUILD_ROOT%{_sbindir}/runvdr
+ -e 's|/usr/sbin/|%{_sbindir}/|' \
+ -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|g' \
+ -e 's|/usr/lib/vdr\b|%{plugindir}|' \
+ -e 's|VDR_PLUGIN_VERSION|%{apiver}|' \
+ $RPM_BUILD_ROOT%{_sbindir}/runvdr
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-sed -e 's|/usr/lib/vdr/|%{plugindir}/|' < %{SOURCE2} \
- > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
+install -Dm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
+sed -i \
+ -e 's|/usr/lib/vdr/|%{plugindir}/|' \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
touch $RPM_BUILD_ROOT%{videodir}/.update
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
-sed -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|' \
- -e 's|/var/run/vdr/|%{rundir}/|' < %{SOURCE14} \
- > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
-chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
-sed -e 's|/var/lib/vdr/video|%{videodir}|' -e 's|/etc/vdr/|%{configdir}/|' \
- < %{SOURCE15} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
-chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
-sed -e 's|/etc/vdr/|%{configdir}/|' \
- -e 's|VDR_USER|%{vdr_user}|' -e 's|VDR_GROUP|%{vdr_group}|' \
- < %{SOURCE19} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-check-setup
-chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-check-setup
-sed -e 's|/usr/sbin/|%{_sbindir}/|' -e 's|/var/run/vdr/|%{rundir}/|' \
- < %{SOURCE21} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-set-wakeup
-chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-set-wakeup
-
-install -dm 755 $RPM_BUILD_ROOT%{_unitdir}
-sed -e 's|/usr/lib/vdr/|%{plugindir}/|' -e 's|/usr/sbin/|%{_sbindir}/|' \
- -e 's|/usr/share/doc/vdr/|%{_pkgdocdir}/|' \
- < %{SOURCE1} > $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+
+install -m 755 %{SOURCE14} $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+sed -i \
+ -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|' \
+ -e 's|/var/run/vdr/|%{rundir}/|' \
+ $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+
+install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
+sed -i \
+ -e 's|/var/lib/vdr/video|%{videodir}|' \
+ -e 's|/etc/vdr/|%{configdir}/|' \
+ $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
+
+install -m 755 %{SOURCE19} $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-check-setup
+sed -i \
+ -e 's|/etc/vdr/|%{configdir}/|' \
+ -e 's|VDR_USER|%{vdr_user}|' \
+ -e 's|VDR_GROUP|%{vdr_group}|' \
+ $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-check-setup
+
+install -m 755 %{SOURCE21} $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-set-wakeup
+sed -i \
+ -e 's|/usr/sbin/|%{_sbindir}/|' \
+ -e 's|/var/run/vdr/|%{rundir}/|' \
+ $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-set-wakeup
+
+install -Dm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+sed -i \
+ -e 's|/usr/lib/vdr/|%{plugindir}/|' \
+ -e 's|/usr/sbin/|%{_sbindir}/|' \
+ -e 's|/usr/share/doc/vdr/|%{_pkgdocdir}/|' \
+ $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
install -Dpm 440 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/vdr
@@ -361,16 +373,17 @@ install -dm 755 $RPM_BUILD_ROOT%{rundir}
touch $RPM_BUILD_ROOT%{rundir}/next-timer
install -dm 755 $RPM_BUILD_ROOT%{vardir}
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
- > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
+install -Dm 644 %{SOURCE4} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
+sed -i \
+ -e 's/VDR_GROUP/%{vdr_group}/' \
+ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
install -dm 755 $RPM_BUILD_ROOT%{_pkgdocdir}
install -pm 644 CHANGES.package.old CONTRIBUTORS COPYING HISTORY* INSTALL \
- MANUAL PLUGINS.html README* UPDATE-?.?.0 $RPM_BUILD_ROOT%{_pkgdocdir}
+ MANUAL PLUGINS.html README* UPDATE-?.?.0 $RPM_BUILD_ROOT%{_pkgdocdir}
%if %{with docs}
cp -pR srcdoc/html $RPM_BUILD_ROOT%{_pkgdocdir}
%endif
@@ -383,7 +396,7 @@ install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
install -pm 644 Make.{config,global} plugins.mk $RPM_BUILD_ROOT%{_libdir}/vdr
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
- $RPM_BUILD_ROOT%{_libdir}/vdr
+ $RPM_BUILD_ROOT%{_libdir}/vdr
macrodir=%{_sysconfdir}/rpm
[ -d %{_rpmconfigdir}/macros.d ] && macrodir=%{_rpmconfigdir}/macros.d
install -Dpm 644 %{SOURCE17} $RPM_BUILD_ROOT$macrodir/macros.vdr
@@ -394,32 +407,30 @@ echo $macrodir/macros.vdr > %{name}-devel.files
%find_lang %{name}
sed -i -e '1i%%defattr(-,root,root,-)' %{name}.lang
-%if 0%{?fedora} || 0%{?rhel} > 6
install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
echo "d %{rundir} 0755 %{vdr_user} root -" \
- > $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
+ > $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
echo "%{_prefix}/lib/tmpfiles.d/%{name}.conf" \
- >> %{name}.lang
-%endif
+ >> %{name}.lang
# plugins
%make_install -C PLUGINS/src/dvbhddevice
install -pm 644 %{SOURCE12} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/dvbhddevice.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/dvbhddevice.conf
%find_lang %{name}-dvbhddevice
%make_install -C PLUGINS/src/dvbsddevice
install -pm 644 %{SOURCE8} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/dvbsddevice.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/dvbsddevice.conf
%make_install -C PLUGINS/src/rcu
install -pm 644 %{SOURCE20} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/rcu.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/rcu.conf
%make_install -C PLUGINS/src/skincurses
install -pm 644 %{SOURCE11} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
%find_lang %{name}-skincurses
@@ -433,10 +444,9 @@ fi
%pre
getent passwd %{vdr_user} >/dev/null || \
useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
- -c "Video Disk Recorder" %{vdr_user} || :
+ -G audio,cdrom,dialout -c "Video Disk Recorder" %{vdr_user} || :
%post
-usermod -a -G audio,cdrom,dialout %{vdr_user}
[ $1 -eq 1 ] && systemctl daemon-reload &>/dev/null || :
%preun
More information about the scm-commits
mailing list