rpms/vdradmin-am/devel vdradmin-am-3.6.6-config.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 vdradmin-am.spec, 1.18, 1.19 vdradmin-am-3.6.5-config.patch, 1.1, NONE

Sun Mar 14 10:23:26 UTC 2010

Author: scop

Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24035

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Added Files:
	vdradmin-am-3.6.6-config.patch 
Removed Files:
	vdradmin-am-3.6.5-config.patch 
Log Message:
* Sun Mar 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.6.6-1
- Update to 3.6.6; most of config patch applied upstream.
- Remove MAIL_FROM from default config to use runtime default.
- Create default certs dir and (unused) log dir.


vdradmin-am-3.6.6-config.patch:
 vdradmind.pl |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE vdradmin-am-3.6.6-config.patch ---
--- vdradmind.pl~	2010-02-04 18:17:11.000000000 +0200
+++ vdradmind.pl	2010-02-05 20:12:47.000000000 +0200
@@ -95,7 +95,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)_";
 
@@ -143,7 +143,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";
@@ -279,8 +279,8 @@
     $USER_CSS      = "${BASENAME}user.css";
     bindtextdomain("vdradmin", "${BASENAME}locale");
 } else {
-    $ETCDIR        = "/etc/vdradmin";
-    $CERTSDIR      = "${ETCDIR}/certs";
+    $ETCDIR        = "/var/lib/vdradmin";
+    $CERTSDIR      = "/etc/pki/tls/private/vdradmin";
     $TEMPLATEDIR   = "/usr/share/vdradmin/template";
     $TEMPLATECACHE = "/var/cache/vdradmin";
     $LOGDIR        = "/var/log/vdradmin";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Dec 2009 19:32:40 -0000	1.13
+++ .cvsignore	14 Mar 2010 10:23:26 -0000	1.14
@@ -1 +1,2 @@
 vdradmin-am-3.6.5.tar.bz2
+vdradmin-am-3.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Dec 2009 19:32:40 -0000	1.13
+++ sources	14 Mar 2010 10:23:26 -0000	1.14
@@ -1 +1,2 @@
 34ac04af6d1b0495f10cd06e85abb990  vdradmin-am-3.6.5.tar.bz2
+0a72406611a64ad10442effed0fb0a29  vdradmin-am-3.6.6.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- vdradmin-am.spec	30 Dec 2009 19:32:40 -0000	1.18
+++ vdradmin-am.spec	14 Mar 2010 10:23:26 -0000	1.19
@@ -3,7 +3,7 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.6.5
+Version:        3.6.6
 Release:        1%{?dist}
 Summary:        Web interface for VDR
 
@@ -15,7 +15,7 @@ Source0:        http://andreas.vdr-devel
 Source1:        %{name}.init
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
-Patch0:         %{name}-3.6.5-config.patch
+Patch0:         %{name}-3.6.6-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,14 +39,11 @@ to a local or remote VDR install to use 
 %prep
 %setup -q
 %patch0
-./make.sh utf8clean
 %{__perl} -pi -e \
   's|"/video"|"%{videodir}"| ;
    s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
    s|-s \$AT_FILENAME |-f \$AT_FILENAME|' \
   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
@@ -60,7 +57,8 @@ install -pm 644 %{SOURCE2} .
    s|/usr/share/vdradmin/template|./template|' \
   vdradmind.pl > vdradmind.tmp
 %{__perl} ./vdradmind.tmp --config < /dev/null
-./make.sh utf8add
+# Would contain build host name, removed to use runtime default
+sed -i -e /^MAIL_FROM/d vdradmind.conf
 ./make.sh po
 
 
@@ -73,10 +71,11 @@ cp -pR template $RPM_BUILD_ROOT/usr/shar
 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,run}/vdradmin
+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
 install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
+install -dm 500 $RPM_BUILD_ROOT/etc/pki/tls/private/vdradmin
 %find_lang vdradmin
 
 
@@ -118,14 +117,21 @@ fi
 /usr/share/vdradmin/
 %{_mandir}/man8/vdradmind.8*
 %defattr(-,vdradmin,vdradmin,-)
+%dir /etc/pki/tls/private/vdradmin/
 %dir /var/cache/vdradmin/
 %dir /var/lib/vdradmin/
 %config(noreplace) /var/lib/vdradmin/vdradmind.conf
 %dir /var/run/vdradmin/
+%dir /var/log/vdradmin/
 %defattr(-,root,root,-)
 
 
 %changelog
+* Sun Mar 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.6.6-1
+- Update to 3.6.6; most of config patch applied upstream.
+- Remove MAIL_FROM from default config to use runtime default.
+- Create default certs dir and (unused) log dir.
+
 * Wed Dec 30 2009 Ville Skyttä <ville.skytta at iki.fi> - 3.6.5-1
 - Update to 3.6.5.
 - Log to syslog by default.


--- vdradmin-am-3.6.5-config.patch DELETED ---

