rpms/vdradmin-am/devel vdradmin-am-3.6.2-config.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 vdradmin-am.spec, 1.12, 1.13 vdradmin-am-3.6.0beta-config.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28734/devel

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Added Files:
	vdradmin-am-3.6.2-config.patch 
Removed Files:
	vdradmin-am-3.6.0beta-config.patch 
Log Message:
* Mon Jun 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 3.6.2-1
- 3.6.2.


vdradmin-am-3.6.2-config.patch:

--- NEW FILE vdradmin-am-3.6.2-config.patch ---
--- vdradmind.pl~	2008-06-30 09:04:14.000000000 +0300
+++ vdradmind.pl	2008-06-30 20:31:13.000000000 +0300
@@ -86,7 +86,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|it|nl|ru)_";
 
@@ -117,7 +117,7 @@
 my (%CONFIG, %CONFIG_TEMP);
 $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;
@@ -134,7 +134,7 @@
 $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{TEMPLATE}   = "default";
@@ -195,9 +195,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} = "";
 
@@ -260,10 +260,10 @@
     $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 @@
     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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Dec 2007 20:46:17 -0000	1.10
+++ .cvsignore	30 Jun 2008 17:56:18 -0000	1.11
@@ -1 +1 @@
-vdradmin-am-3.6.1.tar.bz2
+vdradmin-am-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Dec 2007 20:46:17 -0000	1.10
+++ sources	30 Jun 2008 17:56:18 -0000	1.11
@@ -1 +1 @@
-5045fa4ad646dc76a7b1045e4f4c790c  vdradmin-am-3.6.1.tar.bz2
+d034b061592d35844b74a5fb4b7984c2  vdradmin-am-3.6.2.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vdradmin-am.spec	19 Dec 2007 20:46:17 -0000	1.12
+++ vdradmin-am.spec	30 Jun 2008 17:56:18 -0000	1.13
@@ -3,7 +3,7 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.6.1
+Version:        3.6.2
 Release:        1%{?dist}
 Summary:        Web interface for VDR
 
@@ -16,7 +16,7 @@
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
 Patch0:         %{name}-3.4.5a-proctitle.patch
-Patch1:         %{name}-3.6.0beta-config.patch
+Patch1:         %{name}-3.6.2-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -41,7 +41,6 @@
 %{__perl} -pi -e \
   's|"/video"|"%{videodir}"| ;
    s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
-   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data| ;
    s|-s \$AT_FILENAME |-f \$AT_FILENAME|' \
   vdradmind.pl
 %{__perl} -pi -e \
@@ -126,6 +125,9 @@
 
 
 %changelog
+* Mon Jun 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 3.6.2-1
+- 3.6.2.
+
 * Wed Dec 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.1-1
 - 3.6.1.
 - Fix translation file permissions/ownership.


--- vdradmin-am-3.6.0beta-config.patch DELETED ---