rpms/vdradmin-am/devel vdradmin-am-3.6.5-config.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vdradmin-am.spec, 1.17, 1.18 vdradmin-am-3.6.2-config.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Wed Dec 30 19:32:40 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5743
Modified Files:
.cvsignore sources vdradmin-am.spec
Added Files:
vdradmin-am-3.6.5-config.patch
Removed Files:
vdradmin-am-3.6.2-config.patch
Log Message:
* 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:
vdradmind.pl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE vdradmin-am-3.6.5-config.patch ---
--- vdradmind.pl~ 2009-12-30 14:43:05.000000000 +0200
+++ vdradmind.pl 2009-12-30 20:07:06.000000000 +0200
@@ -94,7 +94,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)_";
@@ -124,7 +124,7 @@
my (%CONFIG, %CONFIG_TEMP);
$CONFIG{LOGLEVEL} = 4; #LOG_WARNING
$CONFIG{LOGGING} = 0;
-$CONFIG{LOGFILE} = "vdradmind.log";
+$CONFIG{LOGFILE} = "syslog";
$CONFIG{MOD_GZIP} = 0;
$CONFIG{CACHE_BG_UPDATE} = 1;
$CONFIG{CACHE_TIMEOUT} = 60;
@@ -142,7 +142,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";
@@ -203,9 +203,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} = "";
@@ -269,10 +269,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";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 21 Dec 2008 09:08:04 -0000 1.12
+++ .cvsignore 30 Dec 2009 19:32:40 -0000 1.13
@@ -1 +1 @@
-vdradmin-am-3.6.4.tar.bz2
+vdradmin-am-3.6.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 21 Dec 2008 09:08:05 -0000 1.12
+++ sources 30 Dec 2009 19:32:40 -0000 1.13
@@ -1 +1 @@
-ae3efed3f803d8524098f15a365c7838 vdradmin-am-3.6.4.tar.bz2
+34ac04af6d1b0495f10cd06e85abb990 vdradmin-am-3.6.5.tar.bz2
Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vdradmin-am.spec 27 Jul 2009 06:48:35 -0000 1.17
+++ vdradmin-am.spec 30 Dec 2009 19:32:40 -0000 1.18
@@ -3,8 +3,8 @@
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
Name: vdradmin-am
-Version: 3.6.4
-Release: 4%{?dist}
+Version: 3.6.5
+Release: 1%{?dist}
Summary: Web interface for VDR
Group: Applications/Internet
@@ -15,14 +15,16 @@ Source0: http://andreas.vdr-devel
Source1: %{name}.init
Source2: %{name}-httpd.conf
Source3: %{name}.rwtab
-Patch0: %{name}-3.6.2-config.patch
+Patch0: %{name}-3.6.5-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(HTTP::Date)
BuildRequires: perl(Locale::gettext)
Requires: perl(Locale::gettext)
+Requires: perl(Sys::Syslog)
Requires: perl(Template::Plugin::JavaScript)
Requires: initscripts >= 8.22
Requires(pre): shadow-utils
@@ -71,7 +73,7 @@ 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,log,run}/vdradmin
+install -dm 755 $RPM_BUILD_ROOT/var/{cache,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}
@@ -119,98 +121,101 @@ fi
%dir /var/cache/vdradmin/
%dir /var/lib/vdradmin/
%config(noreplace) /var/lib/vdradmin/vdradmind.conf
-/var/log/vdradmin/
%dir /var/run/vdradmin/
%defattr(-,root,root,-)
%changelog
+* 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.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Wed Jul 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 3.6.4-3
+* Wed Jul 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 3.6.4-3
- Add dependency on TT JavaScript plugin, some templates use it.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Sun Dec 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 3.6.4-1
+* Sun Dec 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 3.6.4-1
- 3.6.4, proctitle patch applied upstream.
-* Mon Jun 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 3.6.2-1
+* 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
+* Wed Dec 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.1-1
- 3.6.1.
- Fix translation file permissions/ownership.
-* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-2
+* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-2
- Clean up legacy cruft from init script.
-* Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-1
+* Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-1
- 3.6.0.
-* Mon Aug 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-0.2.rc
+* Mon Aug 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-0.2.rc
- 3.6.0rc.
-* Sat Aug 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.6.0-0.1.beta
+* 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
+* 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.
-* Thu Jan 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-1
+* 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
+* Fri Dec 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.2-1
- 3.5.2.
-* Sat Dec 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.1-1
+* Sat Dec 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.1-1
- 3.5.1.
- Add read only root/temporary state config.
-* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.0-1
+* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.5.0-1
- 3.5.0, patch to retain autotimer functionality by default on upgrades.
-* Wed Oct 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.7-3
+* Wed Oct 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.7-3
- Improve description (#211043).
-* Tue Oct 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.7-2
+* 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
+* 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
+* 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
+* 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
+* 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
+* 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
+* 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
+* 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
+* 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
+* Wed Mar 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.4.4-0.1.beta
- 3.4.4beta.
--- vdradmin-am-3.6.2-config.patch DELETED ---
More information about the fedora-extras-commits
mailing list