rpms/rpmconf/devel .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 rpmconf.spec, 1.6, 1.7 sources, 1.4, 1.5

[Miroslav Suchý]

Author: msuchy

Update of /cvs/pkgs/rpms/rpmconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23281/devel

Modified Files:
	.cvsignore import.log rpmconf.spec sources 
Log Message:
Import new upstream version - rpmconf-0.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Aug 2009 07:42:13 -0000	1.4
+++ .cvsignore	7 Jan 2010 09:56:53 -0000	1.5
@@ -1 +1 @@
-rpmconf-0.1.8.tar.gz
+rpmconf-0.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	31 Aug 2009 07:42:13 -0000	1.3
+++ import.log	7 Jan 2010 09:56:53 -0000	1.4
@@ -1,3 +1,4 @@
 rpmconf-0_1_6-1:HEAD:rpmconf-0.1.6-1.src.rpm:1248073836
 rpmconf-0_1_7-1:HEAD:rpmconf-0.1.7-1.src.rpm:1251471879
 rpmconf-0_1_8-1:HEAD:rpmconf-0.1.8-1.src.rpm:1251704466
+rpmconf-0_2_1-1:HEAD:rpmconf-0.2.1-1.src.rpm:1262858032


Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/rpmconf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rpmconf.spec	7 Dec 2009 02:16:45 -0000	1.6
+++ rpmconf.spec	7 Jan 2010 09:56:53 -0000	1.7
@@ -2,19 +2,20 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.8
-Release: 2%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: docbook-utils
+BuildRequires: docbook-dtd31-sgml
 
 %description
-This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+This tool seach for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
 with them:
-Keep current version, place back old version or watch the diff.
+Keep current version, place back old version, watch the diff or merge.
 
 %prep
 %setup -q
@@ -37,8 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
-* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1.8-2
-- rebuild against perl 5.10.1
+* Thu Jan  7 2010 Miroslav Suchy <msuchy at redhat.com> 0.2.1-1
+- implement merging of files using vimdiff, gvimdiff, meld,
+  and kdiff3
+- added command line option --version
+- added command line option --debug
+- fix build requires on Mandriva
 
 * Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
 - fix copy and past typo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Aug 2009 07:42:13 -0000	1.4
+++ sources	7 Jan 2010 09:56:53 -0000	1.5
@@ -1 +1 @@
-229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz
+c94217ef5921e799672960eba26e9eb0  rpmconf-0.2.1.tar.gz