commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2017-05-10 20:53:31
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is "rpmconf"
Wed May 10 20:53:31 2017 rev:12 rq:494043 version:1.0.19
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2016-07-27
16:12:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2017-05-10
20:53:33.185146331 +0200
@@ -1,0 +2,7 @@
+Tue May 9 16:45:47 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 1.0.19:
+ * Implement --test.
+ * Correctly pass /dev/null to difflib (rh#1350249).
+
+---
Old:
rpmconf-1.0.18.tar.gz
New:
rpmconf-1.0.19.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.TCQ4mC/_old 2017-05-10 20:53:33.973035149 +0200
+++ /var/tmp/diff_new_pack.TCQ4mC/_new 2017-05-10 20:53:33.981034021 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rpmconf
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.18
+Version:1.0.19
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
@@ -65,8 +65,8 @@
--install-scripts %{_sbindir}
chmod a+x %{buildroot}%{python3_sitelib}/%{name}/%{name}.py
-install -Dm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
-install -Dm 0644 docs/build/man/%{name}.3 %{buildroot}%{_mandir}/man3/%{name}.3
+install -Dpm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
+install -Dpm 0644 docs/build/man/%{name}.3
%{buildroot}%{_mandir}/man3/%{name}.3
mkdir -p %{buildroot}%{_datadir}/%{name}/
find docs/build/ -type f -name ".buildinfo" -delete -print
++ rpmconf-1.0.18.tar.gz -> rpmconf-1.0.19.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.18-1/.tito/packages/rpmconf
new/rpmconf-rpmconf-1.0.19-1/.tito/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.18-1/.tito/packages/rpmconf 2016-06-24
09:41:27.0 +0200
+++ new/rpmconf-rpmconf-1.0.19-1/.tito/packages/rpmconf 2017-04-05
13:56:08.0 +0200
@@ -1 +1 @@
-1.0.18-1 ./
+1.0.19-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.18-1/Makefile
new/rpmconf-rpmconf-1.0.19-1/Makefile
--- old/rpmconf-rpmconf-1.0.18-1/Makefile 2017-05-10 20:53:34.141011446
+0200
+++ new/rpmconf-rpmconf-1.0.19-1/Makefile 1970-01-01 01:00:00.0
+0100
@@ -1 +0,0 @@
-symbolic link to rel-eng/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.18-1/bin/rpmconf
new/rpmconf-rpmconf-1.0.19-1/bin/rpmconf
--- old/rpmconf-rpmconf-1.0.18-1/bin/rpmconf2016-06-24 09:41:27.0
+0200
+++ new/rpmconf-rpmconf-1.0.19-1/bin/rpmconf2017-04-05 13:56:08.0
+0200
@@ -42,6 +42,9 @@
metavar="EDITOR",
help="Define which frontend should be used for
merging."
" For list of valid types see man page.")
+parser.add_argument("-t", "--test", dest="test", action="store_true",
+help="Only test if there are some files for merge.
Return "
+ "0 exit code if there is none such file.")
parser.add_argument("-Z", dest="selinux", action="store_true",
help="Display SELinux context of old and new file.")
parser.add_argument("-o", "--owner", dest="owner", metavar="PACKAGE",
@@ -59,7 +62,7 @@
rconf = rpmconf.RpmConf(packages=None if args.all else args.owner,
clean=args.clean, debug=args.debug,
diff=args.diff, frontend=args.frontend,
-selinux=args.selinux)
+selinux=args.selinux, test=args.test)
if os.geteuid() != 0:
sys.stderr.write("Most features are not useful without root
privileges!!!\n")
time.sleep(5)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.18-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.19-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.18-1/rpmconf/rpmconf.py 2016-06-24
09:41:27.0 +0200
+++
commit rpmconf for openSUSE:Factory
Hello community, here is the log from the commit of package rpmconf for openSUSE:Factory checked in at 2016-07-27 16:12:45 Comparing /work/SRC/openSUSE:Factory/rpmconf (Old) and /work/SRC/openSUSE:Factory/.rpmconf.new (New) Package is "rpmconf" Changes: --- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-12-06 07:42:26.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2016-07-27 16:12:53.0 +0200 @@ -1,0 +2,10 @@ +Sat Jul 23 16:15:39 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 1.0.18 (changes since 1.0.16): + * Fix a typo in /usr/bin/ls call arguments. + * Standard import "import errno" comes before +"from rpmconf import rpmconf". + * Set loglevel only for rpmconf logger. + * Add pylintrc. + +--- Old: rpmconf-1.0.16.tar.gz New: rpmconf-1.0.18.tar.gz Other differences: -- ++ rpmconf.spec ++ --- /var/tmp/diff_new_pack.tq3jDC/_old 2016-07-27 16:12:54.0 +0200 +++ /var/tmp/diff_new_pack.tq3jDC/_new 2016-07-27 16:12:54.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmconf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: rpmconf -Version:1.0.16 +Version:1.0.18 Release:0 Summary:Tool to handle rpmnew and rpmsave files License:GPL-3.0+ ++ rpmconf-1.0.16.tar.gz -> rpmconf-1.0.18.tar.gz ++ 2152 lines of diff (skipped)
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-12-06 07:42:25
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is "rpmconf"
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-12-01
09:19:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-12-06
07:42:26.0 +0100
@@ -1,0 +2,6 @@
+Fri Dec 4 10:29:26 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.16:
+ * Local variable 'fromdate' referenced before assignment.
+
+---
Old:
rpmconf-1.0.15.tar.gz
New:
rpmconf-1.0.16.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.GpEIjS/_old 2015-12-06 07:42:27.0 +0100
+++ /var/tmp/diff_new_pack.GpEIjS/_new 2015-12-06 07:42:27.0 +0100
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.15
+Version:1.0.16
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
++ rpmconf-1.0.15.tar.gz -> rpmconf-1.0.16.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.15-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.16-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.15-1/rel-eng/packages/rpmconf 2015-11-27
09:11:57.0 +0100
+++ new/rpmconf-rpmconf-1.0.16-1/rel-eng/packages/rpmconf 2015-12-01
13:08:04.0 +0100
@@ -1 +1 @@
-1.0.15-1 ./
+1.0.16-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.15-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.16-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.15-1/rpmconf/rpmconf.py 2015-11-27
09:11:57.0 +0100
+++ new/rpmconf-rpmconf-1.0.16-1/rpmconf/rpmconf.py 2015-12-01
13:08:04.0 +0100
@@ -150,6 +150,8 @@
fromdate = None
err_msg += err_msg_template.format(file1)
file1 = "/dev/null"
+else:
+fromdate = time.ctime(os.stat(file1).st_mtime)
if os.path.islink(file2):
err_msg += "Info: '{0}' is symlink to '{1}'.\n".format(file2,
os.readlink(file2))
if self.is_broken_symlink(file2):
@@ -158,6 +160,8 @@
todate = None
err_msg += err_msg_template.format(file2)
file2 = "/dev/null"
+else:
+todate = time.ctime(os.stat(file2).st_mtime)
try:
fromlines = open(file1, "U").readlines()
tolines = open(file2, "U").readlines()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.15-1/rpmconf.spec
new/rpmconf-rpmconf-1.0.16-1/rpmconf.spec
--- old/rpmconf-rpmconf-1.0.15-1/rpmconf.spec 2015-11-27 09:11:57.0
+0100
+++ new/rpmconf-rpmconf-1.0.16-1/rpmconf.spec 2015-12-01 13:08:04.0
+0100
@@ -1,7 +1,7 @@
Name: rpmconf
Summary:Tool to handle rpmnew and rpmsave files
License:GPLv3
-Version:1.0.15
+Version:1.0.16
Release:1%{?dist}
URL:http://wiki.github.com/xsuchy/rpmconf
# source is created by:
@@ -18,7 +18,9 @@
Requires: rpm-python3
BuildRequires: rpm-python3
#check
+%if 0%{fedora} != 24
BuildRequires: python3-pylint
+%endif
BuildRequires: python3-six
# mergetools
Suggests: diffuse
@@ -70,8 +72,10 @@
mkdir -p %{buildroot}%{_datadir}/rpmconf/
%check
+%if 0%{fedora} != 24
python3-pylint --reports=n %{buildroot}%{_sbindir}/rpmconf
python3-pylint --reports=n %{buildroot}%{python3_sitelib}/rpmconf/rpmconf.py
+%endif
%files
%license LICENSE
@@ -92,6 +96,10 @@
%dir %{_datadir}/rpmconf
%changelog
+* Tue Dec 01 2015 Miroslav Suchý 1.0.16-1
+- temporary workaround for BZ 1287055
+- 1287034 - local variable 'fromdate' referenced before assignment
+
* Fri Nov 27 2015 Miroslav Suchý 1.0.15-1
- 1277025 - handle broken symlinks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.15-1/setup.py
new/rpmconf-rpmconf-1.0.16-1/setup.py
--- old/rpmconf-rpmconf-1.0.15-1/setup.py 2015-11-27 09:11:57.0
+0100
+++ new/rpmconf-rpmconf-1.0.16-1/setup.py 2015-12-01 13:08:04.0
+0100
@@ -4,7 +4,7 @@
setup(name = "rpmconf",
packages = ["rpmconf"],
- version = "1.0.15",
+ version = "1.0.16",
description = "Handle rpmnew and rpmsave files",
author = "Igor Gnatenko",
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-12-01 09:19:16
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is "rpmconf"
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-11-26
17:04:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-12-01
09:19:19.0 +0100
@@ -1,0 +2,6 @@
+Sat Nov 28 19:39:30 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.15:
+ * Handle broken symlinks.
+
+---
Old:
rpmconf-1.0.14.tar.gz
New:
rpmconf-1.0.15.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.jjqhCX/_old 2015-12-01 09:19:20.0 +0100
+++ /var/tmp/diff_new_pack.jjqhCX/_new 2015-12-01 09:19:20.0 +0100
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.14
+Version:1.0.15
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
++ rpmconf-1.0.14.tar.gz -> rpmconf-1.0.15.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.15-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf 2015-11-24
11:01:18.0 +0100
+++ new/rpmconf-rpmconf-1.0.15-1/rel-eng/packages/rpmconf 2015-11-27
09:11:57.0 +0100
@@ -1 +1 @@
-1.0.14-1 ./
+1.0.15-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.14-1/rel-eng/releasers.conf
new/rpmconf-rpmconf-1.0.15-1/rel-eng/releasers.conf
--- old/rpmconf-rpmconf-1.0.14-1/rel-eng/releasers.conf 2015-11-24
11:01:18.0 +0100
+++ new/rpmconf-rpmconf-1.0.15-1/rel-eng/releasers.conf 2015-11-27
09:11:57.0 +0100
@@ -10,6 +10,10 @@
releaser = tito.release.FedoraGitReleaser
branches = f22
+[fedora-f23]
+releaser = tito.release.FedoraGitReleaser
+branches = f23
+
[epel]
releaser = tito.release.FedoraGitReleaser
branches = el6 epel7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.15-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py 2015-11-24
11:01:18.0 +0100
+++ new/rpmconf-rpmconf-1.0.15-1/rpmconf/rpmconf.py 2015-11-27
09:11:57.0 +0100
@@ -131,8 +131,7 @@
result.append(rpm_file[0])
return result
-@staticmethod
-def show_diff(file1, file2):
+def show_diff(self, file1, file2):
"""Show differences between two files.
:param file1: Path to first file
@@ -141,8 +140,24 @@
:type file2: str
"""
-fromdate = time.ctime(os.stat(file1).st_mtime)
-todate = time.ctime(os.stat(file2).st_mtime)
+err_msg_template = "Warning: file {} is broken symlink. I'm using
/dev/null instead.\n"
+err_msg = ""
+if os.path.islink(file1):
+err_msg += "Info: '{0}' is symlink to '{1}'.\n".format(file1,
os.readlink(file1))
+if self.is_broken_symlink(file1):
+fromdate = time.ctime(os.stat(file1).st_mtime)
+else:
+fromdate = None
+err_msg += err_msg_template.format(file1)
+file1 = "/dev/null"
+if os.path.islink(file2):
+err_msg += "Info: '{0}' is symlink to '{1}'.\n".format(file2,
os.readlink(file2))
+if self.is_broken_symlink(file2):
+todate = time.ctime(os.stat(file2).st_mtime)
+else:
+todate = None
+err_msg += err_msg_template.format(file2)
+file2 = "/dev/null"
try:
fromlines = open(file1, "U").readlines()
tolines = open(file2, "U").readlines()
@@ -155,12 +170,17 @@
stdout=subprocess.PIPE,
universal_newlines=True)
diff = diff_out.communicate()[0]
-pydoc.pager("".join(diff))
+pydoc.pager(err_msg + "".join(diff))
+
+@staticmethod
+def is_broken_symlink(file1):
+""" Returns true if file is broken symlink. False otherwise. """
+#pylint: disable=no-member
+return os.path.islink(file1) and os.path.exists(file1)
-@classmethod
-def _show_cond_diff(cls, file_ex, file1, file2):
+def _show_cond_diff(self, file_ex, file1, file2):
if os.path.lexists(file_ex):
-
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-11-26 17:04:33
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is "rpmconf"
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-11-17
14:23:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-11-26
17:04:36.0 +0100
@@ -1,0 +2,8 @@
+Wed Nov 25 20:45:35 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.14:
+ * Improve error message.
+ * Check for root privileges.
+ * Clarify man page.
+
+---
Old:
rpmconf-1.0.13.tar.gz
New:
rpmconf-1.0.14.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.kpIuAN/_old 2015-11-26 17:04:37.0 +0100
+++ /var/tmp/diff_new_pack.kpIuAN/_new 2015-11-26 17:04:37.0 +0100
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.13
+Version:1.0.14
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
@@ -59,7 +59,8 @@
SPHINXBUILD=sphinx-build-%{py3_ver}
%install
-python3 setup.py install --skip-build \
+python3 setup.py install \
+ --skip-build \
--root %{buildroot} \
--install-scripts %{_sbindir}
++ rpmconf-1.0.13.tar.gz -> rpmconf-1.0.14.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf
new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf
--- old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf2015-11-13 16:56:44.0
+0100
+++ new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf2015-11-24 11:01:18.0
+0100
@@ -1,5 +1,5 @@
-#!/usr/bin/env python3
-#
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
# vim: noai:ts=4:sw=4:expandtab
#
# Copyright (C) 2015 Igor Gnatenko
@@ -19,7 +19,10 @@
""" Main script which will end up in /usr/sbin/rpmconf """
import argparse
from rpmconf import rpmconf
+import errno
+import os
import sys
+import time
def main():
""" Main entry point. """
@@ -57,7 +60,18 @@
clean=args.clean, debug=args.debug,
diff=args.diff, frontend=args.frontend,
selinux=args.selinux)
-rconf.run()
+if os.geteuid() != 0:
+sys.stderr.write("Most features are not useful without root
privileges!!!\n")
+time.sleep(5)
+
+try:
+rconf.run()
+except IOError as err:
+if err.errno in (errno.EACCES, errno.EPERM):
+sys.stderr.write("Error: You need root permissions to do this!\n")
+sys.exit(1)
+else:
+raise
if __name__ == "__main__":
main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py
new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py
--- old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py2015-11-13
16:56:44.0 +0100
+++ new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py2015-11-24
11:01:18.0 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
# rpmconf documentation build configuration file, created by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf 2015-11-13
16:56:44.0 +0100
+++ new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf 2015-11-24
11:01:18.0 +0100
@@ -1 +1 @@
-1.0.13-1 ./
+1.0.14-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py 2015-11-13
16:56:44.0 +0100
+++ new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py 2015-11-24
11:01:18.0 +0100
@@ -1,5 +1,5 @@
-#!/usr/bin/env python3
-#
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
# vim: noai:ts=4:sw=4:expandtab
# pylint: disable=missing-docstring,too-many-arguments,too-many-branches
#
@@ -243,7 +243,8 @@
print(repr(merge_tool))
subprocess.check_call([merge_tool, conf_file, other_file])
else:
-self.logger.error("You did not selected any frontend for
merge")
+self.logger.error("You did not selected any frontend for
merge.\n" +
+
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-11-17 14:23:23
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is "rpmconf"
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-08-21
07:42:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-11-17
14:23:27.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov 16 14:15:34 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.13:
+ * Do TB when somebody remove file under our hand.
+
+---
Old:
rpmconf-1.0.12.tar.gz
New:
rpmconf-1.0.13.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.kaSPZ1/_old 2015-11-17 14:23:28.0 +0100
+++ /var/tmp/diff_new_pack.kaSPZ1/_new 2015-11-17 14:23:28.0 +0100
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.12
+Version:1.0.13
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
@@ -60,8 +60,9 @@
%install
python3 setup.py install --skip-build \
- --install-scripts %{_sbindir} \
- --root %{buildroot}
+ --root %{buildroot} \
+ --install-scripts %{_sbindir}
+
chmod a+x %{buildroot}%{python3_sitelib}/%{name}/%{name}.py
install -Dm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm 0644 docs/build/man/%{name}.3 %{buildroot}%{_mandir}/man3/%{name}.3
@@ -79,7 +80,7 @@
%defattr(-,root,root)
%doc LICENSE README TODO
%{python3_sitelib}/%{name}/
-%{python3_sitelib}/%{name}-*.egg-info
+%{python3_sitelib}/%{name}-*
%{_mandir}/man3/%{name}.3%{?ext_man}
%changelog
++ rpmconf-1.0.12.tar.gz -> rpmconf-1.0.13.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.12-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.12-1/rel-eng/packages/rpmconf 2015-06-30
14:24:08.0 +0200
+++ new/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf 2015-11-13
16:56:44.0 +0100
@@ -1 +1 @@
-1.0.12-1 ./
+1.0.13-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.12-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.12-1/rpmconf/rpmconf.py 2015-06-30
14:24:08.0 +0200
+++ new/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py 2015-11-13
16:56:44.0 +0100
@@ -39,7 +39,8 @@
import tty
__version__ = "1.0.90"
-
+#uncomment when rpm 4.13 is available
+#rpm.setInterruptSafety(False)
class RpmConf(object):
"""
@@ -287,6 +288,9 @@
option = ""
while (option not in ["Y", "I", "N", "O", "S"]):
+if not os.access(other_file, os.F_OK):
+print("File {} was removed by 3rd party.
Skipping.".format(other_file))
+return
self._ls_conf_file(conf_file, other_file)
print(prompt)
try:
@@ -295,6 +299,9 @@
option = "S"
except KeyboardInterrupt:
sys.exit(1)
+if not os.access(other_file, os.F_OK):
+print("File {} was removed by 3rd party.
Skipping.".format(other_file))
+return
if not option:
option = "N"
if option == "D":
@@ -328,6 +335,9 @@
option = ""
while (option not in ["Y", "I", "N", "O", "S"]):
+if not os.access(other_file, os.F_OK):
+print("File {} was removed by 3rd party.
Skipping.".format(other_file))
+return
self._ls_conf_file(conf_file, other_file)
print(prompt)
try:
@@ -336,6 +346,9 @@
option = "S"
except KeyboardInterrupt:
sys.exit(1)
+if not os.access(other_file, os.F_OK):
+print("File {} was removed by 3rd party.
Skipping.".format(other_file))
+return
if not option:
option = "Y"
if option == "D":
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.12-1/rpmconf.spec
new/rpmconf-rpmconf-1.0.13-1/rpmconf.spec
--- old/rpmconf-rpmconf-1.0.12-1/rpmconf.spec 2015-06-30 14:24:08.0
+0200
+++ new/rpmconf-rpmconf-1.0.13-1/rpmconf.spec 2015-11-13 16:56:44.0
+0100
@@ -1,7 +1,7 @@
Name: rpmconf
Summary:Tool to handle rpmnew and rpmsave files
License:
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-08-21 07:41:32
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is rpmconf
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-07-08
06:59:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-08-21
07:42:03.0 +0200
@@ -1,0 +2,7 @@
+Tue Aug 18 14:51:38 UTC 2015 - sor.ale...@meowr.ru
+
+- Remove python3-rpmconf-doc which contained a HTML page with the
+ same content as does rpmconf (3) manpage.
+ This also solves odd build failures.
+
+---
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.pFLfsY/_old 2015-08-21 07:42:04.0 +0200
+++ /var/tmp/diff_new_pack.pFLfsY/_new 2015-08-21 07:42:04.0 +0200
@@ -49,21 +49,14 @@
%description -n python3-%{name}
Python interface for rpmconf and an essential part of rpmconf.
-%package -n python3-%{name}-doc
-Summary:Documentation of python interface for rpmconf
-Group: Documentation/HTML
-
-%description -n python3-%{name}-doc
-Documentation in HTML generated from code of python3-rpmconf.
-
%prep
%setup -q -n %{name}-%{name}-%{version}-1
-sed -i 's/\(SPHINXBUILD \+= \+\).*$/\1sphinx-build-%{py3_ver}/g' docs/Makefile
%build
python3 setup.py build
docbook2man %{name}.sgml
-make %{?_smp_mflags} -C docs man html
+make %{?_smp_mflags} -C docs man \
+ SPHINXBUILD=sphinx-build-%{py3_ver}
%install
python3 setup.py install --skip-build \
@@ -89,9 +82,4 @@
%{python3_sitelib}/%{name}-*.egg-info
%{_mandir}/man3/%{name}.3%{?ext_man}
-%files -n python3-%{name}-doc
-%defattr(-,root,root)
-%doc LICENSE README TODO
-%doc docs/build/html/
-
%changelog
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-07-08 06:59:21
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is rpmconf
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-06-05
08:46:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-07-08
06:59:25.0 +0200
@@ -1,0 +2,7 @@
+Sat Jul 4 20:12:03 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.12 (changes since 1.0.9):
+ * Other method for stdin flush and handle Ctrl+C correctly.
+ * Disable pylint warnings.
+
+---
Old:
rpmconf-1.0.9-1.tar.gz
New:
rpmconf-1.0.12.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.8bHfCW/_old 2015-07-08 06:59:26.0 +0200
+++ /var/tmp/diff_new_pack.8bHfCW/_new 2015-07-08 06:59:26.0 +0200
@@ -17,13 +17,13 @@
Name: rpmconf
-Version:1.0.9
+Version:1.0.12
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
Group: System/Base
Url:https://github.com/xsuchy/rpmconf
-Source:
https://github.com/xsuchy/%{name}/archive/%{name}-%{version}-1.tar.gz
+Source:
https://github.com/xsuchy/%{name}/archive/%{name}-%{version}-1.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: docbook-utils-minimal
BuildRequires: docbook_3
BuildRequires: python3-Sphinx
@@ -63,7 +63,7 @@
%build
python3 setup.py build
docbook2man %{name}.sgml
-make %{?_smp_mflags} -C docs html man
+make %{?_smp_mflags} -C docs man html
%install
python3 setup.py install --skip-build \
@@ -73,7 +73,6 @@
install -Dm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm 0644 docs/build/man/%{name}.3 %{buildroot}%{_mandir}/man3/%{name}.3
mkdir -p %{buildroot}%{_datadir}/%{name}/
-find docs
find docs/build/ -type f -name .buildinfo -delete -print
%files
++ rpmconf-1.0.9-1.tar.gz - rpmconf-1.0.12.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.9-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.12-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.9-1/rel-eng/packages/rpmconf2015-06-01
11:44:06.0 +0200
+++ new/rpmconf-rpmconf-1.0.12-1/rel-eng/packages/rpmconf 2015-06-30
14:24:08.0 +0200
@@ -1 +1 @@
-1.0.9-1 ./
+1.0.12-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.9-1/rel-eng/releasers.conf
new/rpmconf-rpmconf-1.0.12-1/rel-eng/releasers.conf
--- old/rpmconf-rpmconf-1.0.9-1/rel-eng/releasers.conf 2015-06-01
11:44:06.0 +0200
+++ new/rpmconf-rpmconf-1.0.12-1/rel-eng/releasers.conf 2015-06-30
14:24:08.0 +0200
@@ -6,9 +6,9 @@
releaser = tito.release.FedoraGitReleaser
branches = f21
-[fedora-f20]
+[fedora-f22]
releaser = tito.release.FedoraGitReleaser
-branches = f20
+branches = f22
[epel]
releaser = tito.release.FedoraGitReleaser
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.9-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.12-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.9-1/rpmconf/rpmconf.py 2015-06-01
11:44:06.0 +0200
+++ new/rpmconf-rpmconf-1.0.12-1/rpmconf/rpmconf.py 2015-06-30
14:24:08.0 +0200
@@ -31,10 +31,12 @@
import rpm
import shutil
import signal
+import select
import subprocess
import sys
-from termios import tcflush, TCIOFLUSH
+import termios
import time
+import tty
__version__ = 1.0.90
@@ -100,7 +102,15 @@
if os.isatty(sys.stdin.fileno()):
-tcflush(sys.stdin, TCIOFLUSH)
+old_settings = termios.tcgetattr(sys.stdin)
+try:
+tty.setcbreak(sys.stdin.fileno(), termios.TCSANOW)
+while select.select([sys.stdin], [], [], 0) == ([sys.stdin],
[], []):
+sys.stdin.read(1)
+finally:
+termios.tcsetattr(sys.stdin, termios.TCSANOW, old_settings)
+# BZ 1237075 workaround
+signal.signal(signal.SIGINT, signal.default_int_handler)
return input(question)
@staticmethod
@@ -113,10 +123,10 @@
:rtype: list
-files = rpm.fi(package)
+files = rpm.fi(package) # pylint: disable=no-member
result = []
for rpm_file in files:
-if rpm_file[4] rpm.RPMFILE_CONFIG:
+if rpm_file[4] rpm.RPMFILE_CONFIG: # pylint: disable=no-member
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-06-05 08:46:09
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is rpmconf
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-01-15
15:59:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-06-05
08:46:09.0 +0200
@@ -1,0 +2,11 @@
+Tue Jun 4 11:03:12 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.9 (changes since 1.0.7):
+ * pylint: let the logger expand params.
+ * 1226591 - do not flush stdin, when it is not TTY.
+ * Use RPM Python API to get package name of file.
+ * Minor fixes.
+- Change group of python3-rpmconf-doc to Documentation/HTML.
+- Suggest diffuse, kdiff3, meld, vim as mainstream does.
+
+---
Old:
rpmconf-1.0.7-1.tar.gz
New:
rpmconf-1.0.9-1.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.TBNpIu/_old 2015-06-05 08:46:10.0 +0200
+++ /var/tmp/diff_new_pack.TBNpIu/_new 2015-06-05 08:46:10.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rpmconf
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.7
+Version:1.0.9
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
@@ -31,6 +31,10 @@
BuildRequires: python3-rpm
Requires: python3-%{name}
Requires: python3-rpm
+Suggests: diffuse
+Suggests: kdiff3
+Suggests: meld
+Suggests: vim
BuildArch: noarch
%description
@@ -39,22 +43,21 @@
Keep current version, place back old version, watch the diff or merge.
%package -n python3-%{name}
-Summary:Python interface of rpmconf
+Summary:Python interface for rpmconf
Group: Development/Languages/Python
%description -n python3-%{name}
-Python interface of rpmconf.
+Python interface for rpmconf and an essential part of rpmconf.
%package -n python3-%{name}-doc
Summary:Documentation of python interface for rpmconf
-Group: Development/Languages/Python
+Group: Documentation/HTML
%description -n python3-%{name}-doc
-Documentation generated from code of python3-rpmconf.
+Documentation in HTML generated from code of python3-rpmconf.
%prep
%setup -q -n %{name}-%{name}-%{version}-1
-sed -i 's|%{_bindir}/rpm|/bin/rpm|g' %{name}/%{name}.py
sed -i 's/\(SPHINXBUILD \+= \+\).*$/\1sphinx-build-%{py3_ver}/g' docs/Makefile
%build
@@ -70,21 +73,22 @@
install -Dm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm 0644 docs/build/man/%{name}.3 %{buildroot}%{_mandir}/man3/%{name}.3
mkdir -p %{buildroot}%{_datadir}/%{name}/
-find %{buildroot}%{_datadir} -type f -name .buildinfo -delete -print
+find docs
+find docs/build/ -type f -name .buildinfo -delete -print
%files
%defattr(-,root,root)
%doc LICENSE README TODO
-%dir %{_datadir}/%{name}/
%{_sbindir}/%{name}
-%{_mandir}/man8/%{name}.8*
+%dir %{_datadir}/%{name}/
+%{_mandir}/man8/%{name}.8%{?ext_man}
%files -n python3-%{name}
%defattr(-,root,root)
%doc LICENSE README TODO
%{python3_sitelib}/%{name}/
%{python3_sitelib}/%{name}-*.egg-info
-%{_mandir}/man3/%{name}.3*
+%{_mandir}/man3/%{name}.3%{?ext_man}
%files -n python3-%{name}-doc
%defattr(-,root,root)
++ rpmconf-1.0.7-1.tar.gz - rpmconf-1.0.9-1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.7-1/README
new/rpmconf-rpmconf-1.0.9-1/README
--- old/rpmconf-rpmconf-1.0.7-1/README 2015-01-12 11:55:27.0 +0100
+++ new/rpmconf-rpmconf-1.0.9-1/README 2015-06-01 11:44:06.0 +0200
@@ -3,7 +3,7 @@
What it does:
- run rpmconf --help and you will see :)
-- it search all config file of all installed packages and check if file with
.rpmsave or .rpmnew exists.
+- it searches all config file of all installed packages and check if file with
.rpmsave or .rpmnew exists.
- It allows you to see diff of this file against current file and can do merge.
- It allows you to keep current version or the other one (rpmsave or rpmnew
one).
- it deletes .rpmsave and .rpmnew files which are identical to current file
@@ -11,7 +11,7 @@
- it can search for all orphaned rpmsave and rpmnew files.
- it can dump diffs for unattended automation.
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-01-15 15:59:01
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is rpmconf
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-01-09
20:51:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-01-15
15:59:22.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 15 05:45:55 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.7:
+ * Add / before usr/bin.
+
+---
Old:
rpmconf-1.0.6-1.tar.gz
New:
rpmconf-1.0.7-1.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.mpqAbT/_old 2015-01-15 15:59:22.0 +0100
+++ /var/tmp/diff_new_pack.mpqAbT/_new 2015-01-15 15:59:22.0 +0100
@@ -17,7 +17,7 @@
Name: rpmconf
-Version:1.0.6
+Version:1.0.7
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
@@ -39,7 +39,7 @@
Keep current version, place back old version, watch the diff or merge.
%package -n python3-%{name}
-Summary:Python interface for rpmconf
+Summary:Python interface of rpmconf
Group: Development/Languages/Python
%description -n python3-%{name}
++ rpmconf-1.0.6-1.tar.gz - rpmconf-1.0.7-1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.6-1/rel-eng/packages/rpmconf
new/rpmconf-rpmconf-1.0.7-1/rel-eng/packages/rpmconf
--- old/rpmconf-rpmconf-1.0.6-1/rel-eng/packages/rpmconf2015-01-09
00:13:55.0 +0100
+++ new/rpmconf-rpmconf-1.0.7-1/rel-eng/packages/rpmconf2015-01-12
11:55:27.0 +0100
@@ -1 +1 @@
-1.0.6-1 ./
+1.0.7-1 ./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.6-1/rpmconf/rpmconf.py
new/rpmconf-rpmconf-1.0.7-1/rpmconf/rpmconf.py
--- old/rpmconf-rpmconf-1.0.6-1/rpmconf/rpmconf.py 2015-01-09
00:13:55.0 +0100
+++ new/rpmconf-rpmconf-1.0.7-1/rpmconf/rpmconf.py 2015-01-12
11:55:27.0 +0100
@@ -139,7 +139,7 @@
fromdate, todate)
except UnicodeDecodeError:
# binary files
-diff_out = subprocess.Popen([usr/bin/diff, -u, file1, file2],
+diff_out = subprocess.Popen([/usr/bin/diff, -u, file1, file2],
stdout=subprocess.PIPE,
universal_newlines=True)
diff = diff_out.communicate()[0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.6-1/rpmconf.spec
new/rpmconf-rpmconf-1.0.7-1/rpmconf.spec
--- old/rpmconf-rpmconf-1.0.6-1/rpmconf.spec2015-01-09 00:13:55.0
+0100
+++ new/rpmconf-rpmconf-1.0.7-1/rpmconf.spec2015-01-12 11:55:27.0
+0100
@@ -1,10 +1,13 @@
Name: rpmconf
Summary:Tool to handle rpmnew and rpmsave files
License:GPLv3
-Version:1.0.6
+Version:1.0.7
Release:1%{?dist}
URL:http://wiki.github.com/xsuchy/rpmconf
-Source0:
http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
+# source is created by:
+# git clone https://github.com/xsuchy/rpmconf.git
+# cd rpmconf; tito build --tgz
+Source0:%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: docbook-utils
BuildRequires: docbook-dtd31-sgml
@@ -81,6 +84,11 @@
%dir %{_datadir}/rpmconf
%changelog
+* Mon Jan 12 2015 Miroslav Suchý miros...@suchy.cz 1.0.7-1
+- correctly reference tar.gz
+- add / before usr/bin
+- remove superfluous changelog line
+
* Fri Jan 09 2015 Miroslav Suchý miros...@suchy.cz 1.0.6-1
- let tito bump up version in docs/source/conf.py
@@ -90,9 +98,6 @@
- Split to python class and CLI
- use rpm python api to get version
-* Wed Jan 07 2015 Igor Gnatenko i.gnatenko.br...@gmail.com - 1.0.90-1
-- Split to python class and CLI
-
* Sun Nov 23 2014 Miroslav Suchý msu...@redhat.com 1.0.4-1
- add BR rpm-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmconf-rpmconf-1.0.6-1/setup.py
new/rpmconf-rpmconf-1.0.7-1/setup.py
--- old/rpmconf-rpmconf-1.0.6-1/setup.py2015-01-09 00:13:55.0
+0100
+++ new/rpmconf-rpmconf-1.0.7-1/setup.py2015-01-12 11:55:27.0
+0100
@@ -4,7 +4,7 @@
setup(name = rpmconf,
packages = [rpmconf],
- version = 1.0.6,
+ version = 1.0.7,
description =
commit rpmconf for openSUSE:Factory
Hello community,
here is the log from the commit of package rpmconf for openSUSE:Factory checked
in at 2015-01-09 20:51:01
Comparing /work/SRC/openSUSE:Factory/rpmconf (Old)
and /work/SRC/openSUSE:Factory/.rpmconf.new (New)
Package is rpmconf
Changes:
--- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-01-08
23:02:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-01-09
20:51:14.0 +0100
@@ -1,0 +2,8 @@
+Fri Jan 9 12:37:28 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.0.6 (changes since 1.0.4):
+ * Let tito bump up version in docs/source/conf.py.
+ * Split to python class and CLI.
+ * Use rpm python api to get version.
+
+---
Old:
rpmconf-1.0.4-1.tar.gz
New:
rpmconf-1.0.6-1.tar.gz
Other differences:
--
++ rpmconf.spec ++
--- /var/tmp/diff_new_pack.avir5v/_old 2015-01-09 20:51:15.0 +0100
+++ /var/tmp/diff_new_pack.avir5v/_new 2015-01-09 20:51:15.0 +0100
@@ -17,15 +17,19 @@
Name: rpmconf
-Version:1.0.4
+Version:1.0.6
Release:0
Summary:Tool to handle rpmnew and rpmsave files
License:GPL-3.0+
Group: System/Base
Url:https://github.com/xsuchy/rpmconf
-Source:
https://github.com/xsuchy/rpmconf/archive/%{name}-%{version}-1.tar.gz
+Source:
https://github.com/xsuchy/%{name}/archive/%{name}-%{version}-1.tar.gz
BuildRequires: docbook-utils-minimal
BuildRequires: docbook_3
+BuildRequires: python3-Sphinx
+BuildRequires: python3-devel
+BuildRequires: python3-rpm
+Requires: python3-%{name}
Requires: python3-rpm
BuildArch: noarch
@@ -34,25 +38,57 @@
you what to do with them:
Keep current version, place back old version, watch the diff or merge.
+%package -n python3-%{name}
+Summary:Python interface for rpmconf
+Group: Development/Languages/Python
+
+%description -n python3-%{name}
+Python interface of rpmconf.
+
+%package -n python3-%{name}-doc
+Summary:Documentation of python interface for rpmconf
+Group: Development/Languages/Python
+
+%description -n python3-%{name}-doc
+Documentation generated from code of python3-rpmconf.
+
%prep
%setup -q -n %{name}-%{name}-%{version}-1
-mv -f source/* .
-sed -i 's|%{_bindir}/rpm|/bin/rpm|g' %{name}.py
+sed -i 's|%{_bindir}/rpm|/bin/rpm|g' %{name}/%{name}.py
+sed -i 's/\(SPHINXBUILD \+= \+\).*$/\1sphinx-build-%{py3_ver}/g' docs/Makefile
%build
+python3 setup.py build
docbook2man %{name}.sgml
+make %{?_smp_mflags} -C docs html man
%install
-install -D -m 0755 %{name}.py %{buildroot}%{_sbindir}/%{name}
-install -D -m 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
-
+python3 setup.py install --skip-build \
+ --install-scripts %{_sbindir} \
+ --root %{buildroot}
+chmod a+x %{buildroot}%{python3_sitelib}/%{name}/%{name}.py
+install -Dm 0644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
+install -Dm 0644 docs/build/man/%{name}.3 %{buildroot}%{_mandir}/man3/%{name}.3
mkdir -p %{buildroot}%{_datadir}/%{name}/
+find %{buildroot}%{_datadir} -type f -name .buildinfo -delete -print
%files
%defattr(-,root,root)
-%doc LICENSE README
-%{_sbindir}/%{name}
+%doc LICENSE README TODO
%dir %{_datadir}/%{name}/
+%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*
+%files -n python3-%{name}
+%defattr(-,root,root)
+%doc LICENSE README TODO
+%{python3_sitelib}/%{name}/
+%{python3_sitelib}/%{name}-*.egg-info
+%{_mandir}/man3/%{name}.3*
+
+%files -n python3-%{name}-doc
+%defattr(-,root,root)
+%doc LICENSE README TODO
+%doc docs/build/html/
+
%changelog
++ rpmconf-1.0.4-1.tar.gz - rpmconf-1.0.6-1.tar.gz ++
3956 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
