rpms/vdradmin-am/devel vdradmin-am-3.6.0beta-config.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vdradmin-am.init, 1.2, 1.3 vdradmin-am.spec, 1.7, 1.8 vdradmin-am-3.5.3-config.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Aug 18 08:40:07 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21301
Modified Files:
.cvsignore sources vdradmin-am.init vdradmin-am.spec
Added Files:
vdradmin-am-3.6.0beta-config.patch
Removed Files:
vdradmin-am-3.5.3-config.patch
Log Message:
* Sat Aug 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-0.1.beta
- 3.6.0beta.
- Sync user/group creation scriptlet with current packaging guidelines.
- Add LSB comment block to init script.
- License: GPLv2+ and GPLv2
vdradmin-am-3.6.0beta-config.patch:
--- NEW FILE vdradmin-am-3.6.0beta-config.patch ---
--- vdradmind.pl~ 2007-08-16 17:17:06.000000000 +0300
+++ vdradmind.pl 2007-08-18 00:27:56.000000000 +0300
@@ -87,7 +87,7 @@ use strict;
#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|it|nl|ru)_";
@@ -118,7 +118,7 @@ sub LOG_DEBUG () { 32768 }
my %CONFIG;
$CONFIG{LOGLEVEL} = 81; # 32799
$CONFIG{LOGGING} = 0;
-$CONFIG{LOGFILE} = "vdradmind.log";
+$CONFIG{LOGFILE} = "vdradmin/vdradmind.log";
$CONFIG{MOD_GZIP} = 0;
$CONFIG{CACHE_BG_UPDATE} = 1;
$CONFIG{CACHE_TIMEOUT} = 60;
@@ -135,7 +135,7 @@ $CONFIG{SERVERPORT} = 8001;
$CONFIG{LOCAL_NET} = "0.0.0.0/32";
$CONFIG{VIDEODIR} = "/video";
$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
-$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages";
+$CONFIG{EPGIMAGES} = "/usr/share/vdradmin/epgimages";
$CONFIG{VDRVFAT} = 1;
#
@@ -199,9 +199,9 @@ $CONFIG{NO_EVENTID_ON} = "";
#
$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} = "";
@@ -260,10 +260,10 @@ if (!$SEARCH_FILES_IN_SYSTEM) {
$USER_CSS = "${BASENAME}user.css";
bindtextdomain("vdradmin", "${BASENAME}locale");
} else {
- $ETCDIR = "/etc/vdradmin";
+ $ETCDIR = "/var/lib/vdradmin";
$TEMPLATEDIR = "/usr/share/vdradmin/template";
$LOGDIR = "/var/log";
- $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";
@@ -297,7 +297,7 @@ my $Xconfig = {
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,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 25 Jan 2007 17:00:50 -0000 1.6
+++ .cvsignore 18 Aug 2007 08:39:34 -0000 1.7
@@ -1 +1 @@
-vdradmin-am-3.5.3.tar.bz2
+vdradmin-am-3.6.0beta.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 25 Jan 2007 17:00:50 -0000 1.6
+++ sources 18 Aug 2007 08:39:34 -0000 1.7
@@ -1 +1 @@
-b219506afa6993fb7a997002845f16d6 vdradmin-am-3.5.3.tar.bz2
+7ba7108195ab183c50ca6a8bb0e4a86e vdradmin-am-3.6.0beta.tar.bz2
Index: vdradmin-am.init
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdradmin-am.init 2 Apr 2007 15:03:34 -0000 1.2
+++ vdradmin-am.init 18 Aug 2007 08:39:34 -0000 1.3
@@ -8,6 +8,15 @@
# config: /etc/vdr/vdradmind.conf
# pidfile: /var/run/vdr/vdradmind.pid
+### BEGIN INIT INFO
+# Provides: vdradmind
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: $syslog vdr
+# Should-Stop: $syslog vdr
+# Short-Description: WWW interface daemon for VDR
+### END INIT INFO
+
# Source function library.
. /etc/rc.d/init.d/functions
Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdradmin-am.spec 2 Apr 2007 15:03:34 -0000 1.7
+++ vdradmin-am.spec 18 Aug 2007 08:39:34 -0000 1.8
@@ -3,19 +3,20 @@
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
Name: vdradmin-am
-Version: 3.5.3
-Release: 2%{?dist}
+Version: 3.6.0
+Release: 0.1.beta%{?dist}
Summary: Web interface for VDR
Group: Applications/Internet
-License: GPL
+# infobox.js is GPLv2, everything else GPLv2+
+License: GPLv2+ and GPLv2
URL: http://andreas.vdr-developer.org/en/
-Source0: http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
+Source0: http://andreas.vdr-developer.org/download/%{name}-%{version}beta.tar.bz2
Source1: %{name}.init
Source2: %{name}-httpd.conf
Source3: %{name}.rwtab
Patch0: %{name}-3.4.5a-proctitle.patch
-Patch1: %{name}-3.5.3-config.patch
+Patch1: %{name}-3.6.0beta-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -24,8 +25,7 @@
BuildRequires: perl(Locale::gettext)
Requires: perl(Locale::gettext)
Requires: initscripts >= 8.22
-Requires(pre): %{_sbindir}/groupadd
-Requires(pre): %{_sbindir}/useradd
+Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -35,7 +35,7 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}beta
%patch0
%patch1
%{__perl} -pi -e \
@@ -84,9 +84,11 @@
%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 || :
+getent group vdradmin >/dev/null || groupadd -r vdradmin
+getent passwd vdradmin >/dev/null || \
+useradd -r -g vdradmin -d /var/lib/vdradmin -s /sbin/nologin \
+ -c "VDR web interface" -M -n vdradmin
+exit 0
%post
/sbin/chkconfig --add vdradmind
@@ -122,6 +124,12 @@
%changelog
+* Sat Aug 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-0.1.beta
+- 3.6.0beta.
+- Sync user/group creation scriptlet with current packaging guidelines.
+- Add LSB comment block to init script.
+- License: GPLv2+ and GPLv2
+
* Mon Apr 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-2
- Use correct pid file in init script's daemon/killproc/status calls.
- Add /sbin/chkconfig dependencies for scriptlets.
--- vdradmin-am-3.5.3-config.patch DELETED ---
More information about the scm-commits
mailing list