The branch, master has been updated
via f3e787400b0351d08183df183b6497db53ff6a8d (commit)
from b3d5da4914ddf248e7097d8d0a399f156f667b3a (commit)
- Log -----------------------------------------------------------------
commit f3e787400b0351d08183df183b6497db53ff6a8d
Author: Alexander Strasser <eclip...@gmx.net>
AuthorDate: Thu May 1 22:34:46 2014 +0200
Commit: Alexander Strasser <eclip...@gmx.net>
CommitDate: Sat Aug 30 21:35:28 2014 +0200
web/rss: Include content of the news article
Fixes Trac ticket #844
Inspired-by-patch-from: Gerion Entrup
Signed-off-by: Alexander Strasser <eclip...@gmx.net>
diff --git a/Makefile b/Makefile
index bbd9d51..5c376eb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,19 +38,24 @@ htdocs/%.html: src/% src/%_title src/%_js $(DEPS)
$(RSS_TARGET): htdocs/index.html
echo '<?xml version="1.0" encoding="UTF-8" ?>' > $@
- echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom";>' >>
$@
+ echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom";
xmlns:content="http://purl.org/rss/1.0/modules/content/";>' >> $@
echo '<channel>' >> $@
echo ' <title>FFmpeg RSS</title>' >> $@
echo ' <link>http://ffmpeg.org</link>' >> $@
echo ' <description>FFmpeg RSS</description>' >> $@
echo ' <atom:link href="http://ffmpeg.org/main.rss"; rel="self"
type="application/rss+xml" />' >> $@
- grep '<a *id=".*" *></a><h3>.*20..,.*</h3>' $< | sed 'sX<a *id="\(.*\)"
*> *</a> *<h3>\(.*20..\), *\(.*\)</h3>X\
+ awk '/<a *id=".*" *> *<\/a> *<h3>.*20.., *.*<\/h3>/ { p = 1 }
/<h1>Older entries are in the .*news archive/ { p = 0 } p' $< \
+ | sed 'sX<a *id="\(.*\)" *> *</a> *<h3>\(.*20..\), *\(.*\)</h3>X\
+ ]]></content:encoded>\
+ </item>\
<item>\
<title>\2, \3</title>\
<link>http://ffmpeg.org/index.html#\1</link>\
<guid>http://ffmpeg.org/index.html#\1</guid>\
- </item>\
-X' >> $@
+ <content:encoded><![CDATA[X' \
+ | awk 'NR > 3' >> $@
+ echo ' ]]></content:encoded>' >> $@
+ echo ' </item>' >> $@
echo '</channel>' >> $@
echo '</rss>' >> $@
-----------------------------------------------------------------------
Summary of changes:
Makefile | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
