rpms/vdradmin-am/FC-6 vdradmin-am-3.5.3-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vdradmin-am.spec, 1.4, 1.5 vdradmin-am-3.4.7-config.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30161/FC-6

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Added Files:
	vdradmin-am-3.5.3-config.patch 
Removed Files:
	vdradmin-am-3.4.7-config.patch 
Log Message:
* Thu Jan 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-1
- 3.5.3.
- Install UTF-8 locales too.
- Fix default path to EPG images.


vdradmin-am-3.5.3-config.patch:

--- NEW FILE vdradmin-am-3.5.3-config.patch ---
--- vdradmind.pl~	2007-01-25 16:55:55.000000000 +0200
+++ vdradmind.pl	2007-01-25 18:53:33.000000000 +0200
@@ -87,7 +87,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)_";
 
@@ -110,7 +110,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;
@@ -126,7 +126,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{VDRVFAT}    = 1;
 
 #
@@ -191,9 +191,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} = "";
 
@@ -251,10 +251,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";
@@ -288,7 +288,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/extras/rpms/vdradmin-am/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Dec 2006 19:31:04 -0000	1.4
+++ .cvsignore	25 Jan 2007 17:00:50 -0000	1.5
@@ -1 +1 @@
-vdradmin-am-3.5.2.tar.bz2
+vdradmin-am-3.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Dec 2006 19:31:04 -0000	1.4
+++ sources	25 Jan 2007 17:00:50 -0000	1.5
@@ -1 +1 @@
-7307c78bf9bf57c9f17311380423e6f4  vdradmin-am-3.5.2.tar.bz2
+b219506afa6993fb7a997002845f16d6  vdradmin-am-3.5.3.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/FC-6/vdradmin-am.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdradmin-am.spec	8 Dec 2006 19:31:04 -0000	1.4
+++ vdradmin-am.spec	25 Jan 2007 17:00:50 -0000	1.5
@@ -3,7 +3,7 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.5.2
+Version:        3.5.3
 Release:        1%{?dist}
 Summary:        Web interface for VDR
 
@@ -15,7 +15,7 @@
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
 Patch0:         %{name}-3.4.5a-proctitle.patch
-Patch1:         %{name}-3.4.7-config.patch
+Patch1:         %{name}-3.5.3-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +56,7 @@
    s|/usr/share/vdradmin/template|./template|' \
   vdradmind.pl > vdradmind.tmp
 %{__perl} ./vdradmind.tmp --config < /dev/null
+./make.sh utf8add
 ./make.sh po
 
 
@@ -118,6 +119,11 @@
 
 
 %changelog
+* Thu Jan 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-1
+- 3.5.3.
+- Install UTF-8 locales too.
+- Fix default path to EPG images.
+
 * Fri Dec  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.2-1
 - 3.5.2.
 


--- vdradmin-am-3.4.7-config.patch DELETED ---