Hello community,
here is the log from the commit of package viewvc for openSUSE:Factory checked
in at 2014-03-14 15:18:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/viewvc (Old)
and /work/SRC/openSUSE:Factory/.viewvc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "viewvc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/viewvc/viewvc.changes 2013-09-25
17:23:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.viewvc.new/viewvc.changes 2014-03-14
15:18:02.000000000 +0100
@@ -1,0 +2,10 @@
+Sat Mar 8 19:25:56 UTC 2014 - andreas.stie...@gmx.de
+
+- update to 1.1.22:
+ * minor directory sorting logic fix (re: show_subdir_lastmod)
+ * fix display of show_subdir_lastmod details
+ * pay attention to chardet's detection confidence
+ * linkify line numbers in markup/annotate view
+- some spec file cleaning
+
+-------------------------------------------------------------------
Old:
----
viewvc-1.1.21.tar.gz
New:
----
viewvc-1.1.22.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ viewvc.spec ++++++
--- /var/tmp/diff_new_pack.Zs5X5o/_old 2014-03-14 15:18:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Zs5X5o/_new 2014-03-14 15:18:03.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package viewvc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,35 +16,41 @@
#
-Name: viewvc
-BuildRequires: apache2-devel
-BuildRequires: python-devel
-Version: 1.1.21
-Release: 0
#
-%define apxs /usr/sbin/apxs2
+%define apxs %{_sbindir}/apxs2
%define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
#
%define site_python %(python -c "import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()")
#
%define viewvc_dir /srv/viewvc
-Requires: subversion-python
-Provides: subversion-viewcvs = %{version}
-Provides: viewcvs = %{version}
-Obsoletes: subversion-viewcvs < %{version}
-Obsoletes: viewcvs < %{version}
-Supplements: packageand(subversion-server:apache2)
-Url: http://www.viewvc.org/
+Name: viewvc
+Version: 1.1.22
+Release: 0
Summary: Browse a Subversion Repository with a Web Browser
License: BSD-3-Clause
Group: Development/Tools/Version Control
-#
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: http://www.viewvc.org/
Source0: http://www.viewvc.org/viewvc-%{version}.tar.gz
Source1: viewvc.conf
Source99: viewvc-rpmlintrc
Patch0: viewvc-buglink.patch
+BuildRequires: apache2-devel
+%if 0%{?sles_version} && 0%{?sles_version <= 11}
+BuildRequires: python-devel
+%else
+BuildRequires: pkgconfig(python)
+BuildRequires: pkgconfig(python-2.7)
+BuildRequires: pkgconfig(python2)
+%endif
+Requires: subversion-python
+Supplements: packageand(subversion-server:apache2)
+Provides: subversion-viewcvs = %{version}
+Provides: viewcvs = %{version}
+Obsoletes: subversion-viewcvs < %{version}
+Obsoletes: viewcvs < %{version}
+#
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -58,17 +64,6 @@
ViewVC is the successor of ViewCVS.
-
-
-Authors:
---------
- The ViewCVS Group:
- * Greg Stein
- * Tanaka Akira
- * Tim Cera
- * Peter Funk
- * Jay Painter
-
%prep
%setup -q
%patch0
@@ -76,20 +71,20 @@
%build
%install
-%__rm -rf "lib/vclib/ccvs/rcsparse/test-data"
+rm -rf "lib/vclib/ccvs/rcsparse/test-data"
#
-mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
-cp -avL %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/viewvc.conf
+mkdir -p %{buildroot}/%{apache_sysconfdir}/conf.d
+cp -avL %{SOURCE1} %{buildroot}/%{apache_sysconfdir}/conf.d/viewvc.conf
# viewvc
-./viewvc-install --prefix "%{viewvc_dir}" --destdir "$RPM_BUILD_ROOT"
+./viewvc-install --prefix "%{viewvc_dir}" --destdir %{buildroot}
# hack for usage under mod_python
# http://archive.netbsd.se/?ml=viewcvs-users&a=2007-02&t=3231282
# rename /srv/viewcvs/bin/mod_python/viewvc.py to myviewvc.py
# to prevent import cycle with a newer mod_python versions
-mv $RPM_BUILD_ROOT/srv/viewvc/bin/mod_python/viewvc.py \
- $RPM_BUILD_ROOT/srv/viewvc/bin/mod_python/myviewvc.py
+mv %{buildroot}/srv/viewvc/bin/mod_python/viewvc.py \
+ %{buildroot}/srv/viewvc/bin/mod_python/myviewvc.py
#
-rm -f $RPM_BUILD_ROOT/srv/viewvc/cvsgraph.conf.dist
+rm -f %{buildroot}/srv/viewvc/cvsgraph.conf.dist
sed '
s@^#docroot.*@docroot = /viewvc-docroot@
s@^default_root.*@default_root = your_unnamed_project@
@@ -102,12 +97,12 @@
your_unnamed_project : /srv/svn/repos/<your_unnamed_project> , \
another_project : /srv/svn/repos/<another_project> \
#
-' < conf/viewvc.conf.dist > $RPM_BUILD_ROOT%{viewvc_dir}/viewvc.conf
-diff -up conf/viewvc.conf.dist $RPM_BUILD_ROOT%{viewvc_dir}/viewvc.conf || true
-find $RPM_BUILD_ROOT%{viewvc_dir} -type d | \
-sed "s@$RPM_BUILD_ROOT@%dir @" > files.viewvc
-find $RPM_BUILD_ROOT%{viewvc_dir} -type f | \
-sed "s@$RPM_BUILD_ROOT@@;/\/templates\/\|\.conf$/s@^@%config (noreplace) @" >>
files.viewvc
+' < conf/viewvc.conf.dist > %{buildroot}%{viewvc_dir}/viewvc.conf
+diff -up conf/viewvc.conf.dist %{buildroot}%{viewvc_dir}/viewvc.conf || true
+find %{buildroot}%{viewvc_dir} -type d | \
+sed "s@%{buildroot}@%dir @" > files.viewvc
+find %{buildroot}%{viewvc_dir} -type f | \
+sed "s@%{buildroot}@@;/\/templates\/\|\.conf$/s@^@%config (noreplace) @" >>
files.viewvc
cat files.viewvc
#
++++++ viewvc-1.1.21.tar.gz -> viewvc-1.1.22.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.21/CHANGES new/viewvc-1.1.22/CHANGES
--- old/viewvc-1.1.21/CHANGES 2013-09-13 15:39:39.000000000 +0200
+++ new/viewvc-1.1.22/CHANGES 2014-01-14 15:05:07.000000000 +0100
@@ -1,3 +1,10 @@
+Version 1.1.22 (released 14-Jan-2014)
+
+ * minor directory sorting logic fix (re: show_subdir_lastmod)
+ * fix display of show_subdir_lastmod details (issue #532)
+ * pay attention to chardet's detection confidence
+ * linkify line numbers in markup/annotate view
+
Version 1.1.21 (released 13-Sep-2013)
* fix markup/annotate exception with Python < 2.7 (issue #527)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.21/lib/viewvc.py
new/viewvc-1.1.22/lib/viewvc.py
--- old/viewvc-1.1.21/lib/viewvc.py 2013-09-13 15:40:52.000000000 +0200
+++ new/viewvc-1.1.22/lib/viewvc.py 2014-01-14 15:07:28.000000000 +0100
@@ -14,7 +14,7 @@
#
# -----------------------------------------------------------------------
-__version__ = '1.1.21'
+__version__ = '1.1.22'
# this comes from our library; measure the startup time
import debug
@@ -1658,6 +1658,11 @@
def detect_encoding(text_block):
+ """Return the encoding used by TEXT_BLOCK as detected by the chardet
+ Python module. (Currently, this is used only when syntax
+ highlighting is not enabled/available; otherwise, Pygments does this
+ work for us.)"""
+
# Does the TEXT_BLOCK start with a BOM?
for bom, encoding in [('\xef\xbb\xbf', 'utf-8'),
('\xff\xfe', 'utf-16'),
@@ -1671,7 +1676,16 @@
# If no recognized BOM, see if chardet can help us.
try:
import chardet
- return chardet.detect(text_block).get('encoding')
+
+ # If chardet can confidently claimed a match, we'll use its
+ # findings. (And if that match is 'ascii' -- which is a subset of
+ # utf-8 -- we'll just call it 'utf-8' and score a zero transform.)
+ resp = chardet.detect(text_block)
+ if resp.get('confidence') == 1.0:
+ encoding = resp.get('encoding')
+ if encoding is "ascii":
+ encoding = "utf-8"
+ return encoding
except:
pass
@@ -2123,6 +2137,18 @@
if roottype == "cvs" and sortby == "rev":
sortby = "date"
+ def file_sort_sortby(file1, file2, sortby):
+ # sort according to sortby
+ if sortby == 'rev':
+ return s * revcmp(file1.rev, file2.rev)
+ elif sortby == 'date':
+ return s * cmp(file2.date, file1.date) # latest date is first
+ elif sortby == 'log':
+ return s * cmp(file1.log, file2.log)
+ elif sortby == 'author':
+ return s * cmp(file1.author, file2.author)
+ return s * cmp(file1.name, file2.name)
+
def file_sort_cmp(file1, file2, sortby=sortby, group_dirs=group_dirs, s=s):
# if we're grouping directories together, sorting is pretty
# simple. a directory sorts "higher" than a non-directory, and
@@ -2131,7 +2157,7 @@
if file1.kind == vclib.DIR:
if file2.kind == vclib.DIR:
# two directories, no special handling.
- pass
+ return file_sort_sortby(file1, file2, sortby)
else:
# file1 is a directory, it sorts first.
return -1
@@ -2142,15 +2168,7 @@
# we should have data on these. if not, then it is because we requested
# a specific tag and that tag is not present on the file.
if file1.rev is not None and file2.rev is not None:
- # sort according to sortby
- if sortby == 'rev':
- return s * revcmp(file1.rev, file2.rev)
- elif sortby == 'date':
- return s * cmp(file2.date, file1.date) # latest date is first
- elif sortby == 'log':
- return s * cmp(file1.log, file2.log)
- elif sortby == 'author':
- return s * cmp(file1.author, file2.author)
+ return file_sort_sortby(file1, file2, sortby)
elif file1.rev is not None:
return -1
elif file2.rev is not None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.21/templates/directory.ezt
new/viewvc-1.1.22/templates/directory.ezt
--- old/viewvc-1.1.21/templates/directory.ezt 2009-02-20 16:24:39.000000000
+0100
+++ new/viewvc-1.1.22/templates/directory.ezt 2013-10-21 15:43:16.000000000
+0200
@@ -99,14 +99,18 @@
<td> [entries.ago]</td>
<td> [entries.author]</td>
[is cfg.options.show_logs "1"]
+ <td>
[if-any entries.short_log]
- <td> [entries.short_log][is entries.pathtype "dir"][is
roottype "cvs"]
- <em>(from
[entries.log_file]/[entries.log_rev])</em>[end][end]</td>
- [else]
- <td> </td>
+ [if-any entries.log_rev]
+ <em>(from [entries.log_file]/[entries.log_rev])</em>
+ [entries.short_log]
+ [else][if-any entries.rev]
+ [entries.short_log]
+ [end][end]
[end]
- [end]
- [end]
+ </td>
+ [end]
+ [end]
</tr>
[end]
</tbody>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.21/templates/file.ezt
new/viewvc-1.1.22/templates/file.ezt
--- old/viewvc-1.1.21/templates/file.ezt 2012-10-24 19:01:40.000000000
+0200
+++ new/viewvc-1.1.22/templates/file.ezt 2013-11-18 14:22:27.000000000
+0100
@@ -102,7 +102,7 @@
[end]
<tr class="[rowclass]" id="l[lines.line_number]">
- <td class="vc_file_line_number">[lines.line_number]</td>
+ <td class="vc_file_line_number"><a
href="#l[lines.line_number]">[lines.line_number]</a></td>
[is annotation "annotated"]
<td class="vc_file_line_author">[is lines.rev
last_rev] [else][lines.author][end]</td>
<td class="vc_file_line_rev">[is lines.rev last_rev] [else][if-any
lines.diff_href]<a href="[lines.diff_href]">[end][lines.rev][if-any
lines.diff_href]</a>[end][end]</td>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/viewvc-1.1.21/templates-contrib/newvc/templates/file.ezt
new/viewvc-1.1.22/templates-contrib/newvc/templates/file.ezt
--- old/viewvc-1.1.21/templates-contrib/newvc/templates/file.ezt
2008-05-30 16:47:16.000000000 +0200
+++ new/viewvc-1.1.22/templates-contrib/newvc/templates/file.ezt
2013-11-18 14:22:53.000000000 +0100
@@ -33,7 +33,7 @@
[end]
<tr class="[rowclass]" id="l[lines.line_number]">
- <td class="vc_file_line_number">[lines.line_number]</td>
+ <td class="vc_file_line_number"><a
href="#l[lines.line_number]">[lines.line_number]</a></td>
[is annotation "annotated"]
<td class="vc_file_line_author">[is lines.rev
last_rev] [else][lines.author][end]</td>
<td class="vc_file_line_rev">[is lines.rev last_rev] [else][if-any
lines.diff_href]<a href="[lines.diff_href]">[end][lines.rev][if-any
lines.diff_href]</a>[end][end]</td>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
