rpms/vdradmin-am/devel vdradmin-am-3.4.5a-proctitle.patch, NONE, 1.1 vdradmin-am-3.4.7-config.patch, NONE, 1.1 vdradmin-am-httpd.conf, NONE, 1.1 vdradmin-am.init, NONE, 1.1 vdradmin-am.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Oct 25 09:24:07 UTC 2006
Author: scop
Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977/devel
Modified Files:
.cvsignore sources
Added Files:
vdradmin-am-3.4.5a-proctitle.patch
vdradmin-am-3.4.7-config.patch vdradmin-am-httpd.conf
vdradmin-am.init vdradmin-am.spec
Log Message:
auto-import vdradmin-am-3.4.7-2 on branch devel from vdradmin-am-3.4.7-2.src.rpm
Initial import (#211043).
vdradmin-am-3.4.5a-proctitle.patch:
--- NEW FILE vdradmin-am-3.4.5a-proctitle.patch ---
--- vdradmind.pl~ 2006-05-09 16:09:37.000000000 +0300
+++ vdradmind.pl 2006-05-18 18:31:38.000000000 +0300
@@ -35,6 +35,7 @@
$0 =~ /(^.*\/)/;
$EXENAME = $0;
$BASENAME = $1;
+ $0 = "vdradmind";
unshift(@INC, "/usr/share/vdradmin/lib");
unshift(@INC, $BASENAME . "lib/");
}
vdradmin-am-3.4.7-config.patch:
--- NEW FILE vdradmin-am-3.4.7-config.patch ---
--- vdradmind.pl~ 2006-09-29 12:02:29.000000000 +0300
+++ vdradmind.pl 2006-09-29 19:27:55.000000000 +0300
@@ -89,7 +89,7 @@
#use warnings;
-my $SEARCH_FILES_IN_SYSTEM = 0;
+my $SEARCH_FILES_IN_SYSTEM = 1;
my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value
my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|nl|ru)_";
@@ -112,7 +112,7 @@
my %CONFIG;
$CONFIG{LOGLEVEL} = 81; # 32799
$CONFIG{LOGGING} = 0;
-$CONFIG{LOGFILE} = "vdradmind.log";
+$CONFIG{LOGFILE} = "vdradmin/vdradmind.log";
$CONFIG{MOD_GZIP} = 0;
$CONFIG{CACHE_TIMEOUT} = 60;
$CONFIG{CACHE_LASTUPDATE} = 0;
@@ -128,7 +128,7 @@
$CONFIG{LOCAL_NET} = "0.0.0.0/32";
$CONFIG{VIDEODIR} = "/video";
$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
-$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages";
+$CONFIG{EPGIMAGES} = "/var/lib/vdradmin/epgimages";
$CONFIG{VDRVFAT} = 1;
#
@@ -189,9 +189,9 @@
#
$CONFIG{AT_SENDMAIL} = 0; # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers.
-$CONFIG{MAIL_FROM} = "from\@address.tld";
+chomp($CONFIG{MAIL_FROM} = 'vdradmin@' . (`hostname -f 2>/dev/null` || "localhost.localdomain"));
$CONFIG{MAIL_TO} = "your\@email.address";
-$CONFIG{MAIL_SERVER} = "your.email.server";
+$CONFIG{MAIL_SERVER} = "localhost";
$CONFIG{MAIL_AUTH_USER} = "";
$CONFIG{MAIL_AUTH_PASS} = "";
@@ -247,10 +247,10 @@
$USER_CSS = "${BASENAME}user.css";
bindtextdomain("vdradmin", "${BASENAME}locale");
} else {
- $ETCDIR = "/etc/vdradmin";
+ $ETCDIR = "/var/lib/vdradmin";
$TEMPLATEDIR = "/usr/share/vdradmin/template";
$LOGFILE = "/var/log/$CONFIG{LOGFILE}";
- $PIDFILE = "/var/run/vdradmind.pid";
+ $PIDFILE = "/var/run/vdradmin/vdradmind.pid";
$CONFFILE = "${ETCDIR}/vdradmind.conf";
$AT_FILENAME = "${ETCDIR}/vdradmind.at";
$DONE_FILENAME = "${ETCDIR}/vdradmind.done";
@@ -284,7 +284,7 @@
EVAL_PERL => 1, # evaluate Perl code blocks
CACHE_SIZE => 10000, # Tuning for Templates
COMPILE_EXT => 'cache', # Tuning for Templates
- COMPILE_DIR => '/tmp', # Tuning for Templates
+ COMPILE_DIR => '/var/cache/vdradmin', # Tuning for Templates
VARIABLES => $Xtemplate_vars,
#DEBUG => DEBUG_ALL,
--- NEW FILE vdradmin-am-httpd.conf ---
# -*- apache -*-
# vdradmin - WWW interface for the Video Disk Recorder (VDR)
#
# This is an optional config file for proxying vdradmin with Apache.
# Copy to /etc/httpd/conf.d to do that.
#
# Note: with SELinux in enforcing mode, the httpd_can_network_connect
# SELinux boolean must be on, otherwise httpd won't be able to connect to
# the proxied port below. See the setsebool(8) manual page or use the
# "Allow HTTPD to connect to the network" option in the
# system-config-securitylevel UI.
#
<IfModule mod_proxy.c>
ProxyPass /vdradmin/ http://127.0.0.1:8001/
ProxyPassReverse /vdradmin/ http://127.0.0.1:8001/
<Location /vdradmin/>
AddDefaultCharset Off
</Location>
</IfModule>
--- NEW FILE vdradmin-am.init ---
#!/bin/sh
#
# vdradmind WWW interface daemon for VDR
#
# chkconfig: - 92 08
# description: WWW interface daemon for VDR.
# processname: vdradmind
# config: /etc/vdr/vdradmind.conf
# pidfile: /var/run/vdr/vdradmind.pid
# Source function library.
. /etc/rc.d/init.d/functions
# Source networking configuration.
. /etc/sysconfig/network
# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0
exec="/usr/sbin/vdradmind"
prog=$(basename $exec)
lockfile=/var/lock/subsys/$prog
start() {
echo -n $"Starting $prog: "
daemon --user vdradmin "$exec >/dev/null 2>&1"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
return $retval
}
stop() {
echo -n $"Stopping $prog: "
killproc $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
return $retval
}
restart() {
stop
start
}
case "$1" in
start|stop|restart|reload)
$1
;;
force-reload)
restart
;;
reload)
exit 3 # LSB: not implemented
;;
status)
status $prog
;;
condrestart|try-restart)
[ ! -f $lockfile ] || restart
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
esac
--- NEW FILE vdradmin-am.spec ---
%define cachedir %(vdr-config --cachedir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
Name: vdradmin-am
Version: 3.4.7
Release: 2%{?dist}
Summary: Web interface for VDR
Group: Applications/Internet
License: GPL
URL: http://andreas.vdr-developer.org/en/
Source0: http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}-httpd.conf
Patch0: %{name}-3.4.5a-proctitle.patch
Patch1: %{name}-3.4.7-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: vdr-devel >= 1.3.27-0.4
BuildRequires: gettext
BuildRequires: perl(Locale::gettext)
Requires: perl(Locale::gettext)
Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd
%description
VDRAdmin-AM is a web interface for managing VDR.
%prep
%setup -q
%patch0
%patch1
%{__perl} -pi -e \
's|"/video"|"%{videodir}"| ;
s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data|' \
vdradmind.pl
%{__perl} -pi -e \
's/vdradmind\.pl/vdradmind/g ; s/(TH vdradmin )1/${1}8/' vdradmind.pl.1
for f in CREDITS HISTORY ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
install -pm 644 %{SOURCE2} .
%build
%{__perl} -pe \
's|^\s*\$CONFFILE\s*=.*|\$CONFFILE = "vdradmind.conf";| ;
s|^.*COMPILE_DIR.*$|| ;
s|/usr/share/vdradmin/template|./template|' \
vdradmind.pl > vdradmind.tmp
%{__perl} ./vdradmind.tmp --config < /dev/null
./make.sh po
%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 vdradmind.pl $RPM_BUILD_ROOT%{_sbindir}/vdradmind
install -Dpm 644 vdradmind.pl.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdradmind.8
install -dm 755 $RPM_BUILD_ROOT/usr/share/vdradmin/epgimages
cp -pR template $RPM_BUILD_ROOT/usr/share/vdradmin
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
install -dm 755 $RPM_BUILD_ROOT/var/{cache,log,run}/vdradmin
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdradmind
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/vdradmind
%find_lang vdradmin
%clean
rm -rf $RPM_BUILD_ROOT
%pre
%{_sbindir}/groupadd -r vdradmin 2>/dev/null || :
%{_sbindir}/useradd -c "VDR web interface" -d /var/lib/vdradmin \
-g vdradmin -M -n -r -s /sbin/nologin vdradmin 2>/dev/null || :
%post
/sbin/chkconfig --add vdradmind
%preun
if [ $1 -eq 0 ] ; then
%{_initrddir}/vdradmind stop >/dev/null || :
/sbin/chkconfig --del vdradmind
fi
%postun
if [ $1 -gt 0 ] ; then
rm -rf /var/cache/vdradmin/*
%{_initrddir}/vdradmind try-restart >/dev/null || :
fi
%files -f vdradmin.lang
%defattr(-,root,root,-)
%doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
%doc %{name}-httpd.conf
%{_initrddir}/vdradmind
%{_sbindir}/vdradmind
/usr/share/vdradmin/
%{_mandir}/man8/vdradmind.8*
%defattr(-,vdradmin,vdradmin,-)
%dir /var/cache/vdradmin/
%dir /var/lib/vdradmin/
%config(noreplace) /var/lib/vdradmin/vdradmind.conf
/var/log/vdradmin/
%dir /var/run/vdradmin/
%changelog
* Tue Oct 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.7-2
- Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
- Drop no longer needed Obsoletes and Provides.
- Prune pre-3.4.4 changelog entries.
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.7-1
- 3.4.7.
- Install optional Apache proxy snippet as doc, not in-place.
* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.6-3
- Redirect stdin and stdout to /dev/null in the init script.
* Sun Jul 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.6-2
- Improve default config, enable VFAT compatiblity by default.
* Fri Jul 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.6-1
- 3.4.6.
- Clean up no longer relevant upgrade compat from %%post.
* Thu May 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.5a-1
- 3.4.5a.
* Fri Apr 7 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.4-1
- 3.4.4.
* Thu Mar 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.4-0.1.rc
- 3.4.4rc.
* Mon Mar 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.4-0.1.beta2
- 3.4.4beta2.
* Wed Mar 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.4-0.1.beta
- 3.4.4beta.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Oct 2006 09:22:31 -0000 1.1
+++ .cvsignore 25 Oct 2006 09:23:37 -0000 1.2
@@ -0,0 +1 @@
+vdradmin-am-3.4.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Oct 2006 09:22:31 -0000 1.1
+++ sources 25 Oct 2006 09:23:37 -0000 1.2
@@ -0,0 +1 @@
+b3f862dfa078bdef05b52a841850c65a vdradmin-am-3.4.7.tar.bz2
More information about the scm-commits
mailing list