rpms/xxdiff
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic update by autodist [release 4.0-1mamba;Thu Aug 15 2013]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-05 19:58:45 +01:00
parent 549fa28376
commit 92d6c1a556
2 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -1,2 +1,14 @@
# xxdiff # xxdiff
xxdiff is a Graphical File And Directories Comparator And Merge Tool.
Features:
* Comparing two files, three files, or two directories (shallow and recursive);
* Horizontal diffs highlighting;
* Files can be merged interactively and resulting output visualized and saved;
* Has features to assist in performing merge reviews/policing;
* Can unmerge CVS conflicts in automatically merged file and display them as two files, to help resolve conflicts;
* Uses external diff program to compute differences: works with GNU diff, SGI diff and ClearCase's cleardiff, and any other diff whose output is similar to those;
* Fully customizable with a resource file;
* Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work equall well with KDE or Gnome);
* Features and output that ease integration with scripts.

67
xxdiff.spec Normal file
View File

@ -0,0 +1,67 @@
Name: xxdiff
Version: 4.0
Release: 1mamba
Summary: Graphical File And Directories Comparator And Merge Tool
Group: Graphical Desktop/Applications/Utilities
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://furius.ca/xxdiff/
Source: http://downloads.sourceforge.net/sourceforge/xxdiff/xxdiff-%{version}.tar.bz2
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: libpython-devel
## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
xxdiff is a Graphical File And Directories Comparator And Merge Tool.
Features:
* Comparing two files, three files, or two directories (shallow and recursive);
* Horizontal diffs highlighting;
* Files can be merged interactively and resulting output visualized and saved;
* Has features to assist in performing merge reviews/policing;
* Can unmerge CVS conflicts in automatically merged file and display them as two files, to help resolve conflicts;
* Uses external diff program to compute differences: works with GNU diff, SGI diff and ClearCase's cleardiff, and any other diff whose output is similar to those;
* Fully customizable with a resource file;
* Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work equall well with KDE or Gnome);
* Features and output that ease integration with scripts.
%prep
%setup -q
%build
CFLAGS="%{optflags}" %{__python} setup.py build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%{__python} setup.py install \
--root=%{buildroot} \
--install-headers=%{_includedir}/python \
--install-lib=%{python_sitearch}
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%files
%defattr(-,root,root)
%{_bindir}/svn-foreign
%{_bindir}/xx-*
%{python_sitearch}/xxdiff/*.py
%{python_sitearch}/xxdiff/*.pyc
%{python_sitearch}/xxdiff/scm/*.py
%{python_sitearch}/xxdiff/scm/*.pyc
%{python_sitearch}/xxdiff/scripts/*.py
%{python_sitearch}/xxdiff/scripts/*.pyc
%{python_sitearch}/xxdiff_scripts-%{version}-py*.egg-info
%doc CHANGES COPYING README README.build TODO
%changelog
* Thu Aug 15 2013 Automatic Build System <autodist@mambasoft.it> 4.0-1mamba
- automatic update by autodist
* Thu Jul 11 2013 Automatic Build System <autodist@mambasoft.it> 3.2-2mamba
- automatic rebuild by autodist
* Fri Apr 17 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2-1mamba
- package created by autospec