Bug 480859 (diffuse) - Review Request: diffuse - graphical diff tool
Summary: Review Request: diffuse - graphical diff tool
Alias: diffuse
Product: Fedora
Classification: Fedora
Component: Package Review
Version: rawhide
Hardware: All
OS: Linux
Target Milestone: ---
Assignee: Michael Schwendt
QA Contact: Fedora Extras Quality Assurance
Depends On:
TreeView+ depends on / blocked
Reported: 2009-01-20 22:49 UTC by Jon Levell
Modified: 2014-07-21 12:37 UTC (History)
9 users (show)

Fixed In Version: 0.2.15-4.fc10
Doc Type: Bug Fix
Doc Text:
Clone Of:
Last Closed: 2009-03-11 17:59:39 UTC
Type: ---
bugs.michael: fedora-review+
gwync: fedora-cvs+

Attachments (Terms of Use)

Description Jon Levell 2009-01-20 22:49:38 UTC
Spec URL: http://coralbark.net/fedora/diffuse/diffuse.spec
SRPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-1.fc10.src.rpm
RPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-1.fc10.noarch.rpm


Diffuse is a graphical tool for merging and comparing text files.  Diffuse is
able to compare an arbitrary number of files side-by-side and gives users the
ability to manually adjust line matching and directly edit files.  Diffuse can
also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
Monotone, Subversion, and SVK repositories for comparison and merging.

Comment 1 François Kooman 2009-01-21 14:38:38 UTC
(Just some remarks from quickly looking over the package)

- For your Source line see: https://fedoraproject.org/wiki/PackagingDrafts/SourceUrl, maybe also make it Source0 instead of just Source.

- See https://fedoraproject.org/wiki/Packaging:Python for specific Python packaging guidelines

- See https://fedoraproject.org/wiki/PackageMaintainers/CreatingPackageHowTo for a template of a spec file (or use rpmdev-newspec), it might be nice to create your spec file based on this or modify yours to better match the template.

rpmlint output:

[fkooman@franek SPECS]$ rpmlint diffuse.spec 
0 packages and 1 specfiles checked; 0 errors, 0 warnings.
[fkooman@franek SPECS]$ 

[fkooman@franek SRPMS]$ rpmlint diffuse-0.2.15-1.fc10.src.rpm 
diffuse.src: W: summary-not-capitalized graphical tool for comparing and merging text files
diffuse.src: W: non-standard-group Development/Tools/Version Control
diffuse.src: W: no-url-tag
1 packages and 0 specfiles checked; 0 errors, 3 warnings.
[fkooman@franek SRPMS]$ 

[fkooman@franek noarch]$ rpmlint diffuse-0.2.15-1.fc10.noarch.rpm 
diffuse.noarch: W: summary-not-capitalized graphical tool for comparing and merging text files
diffuse.noarch: W: non-standard-group Development/Tools/Version Control
diffuse.noarch: W: no-url-tag
diffuse.noarch: W: conffile-without-noreplace-flag /etc/diffuserc
diffuse.noarch: E: invalid-desktopfile /usr/share/applications/diffuse.desktop
1 packages and 0 specfiles checked; 1 errors, 4 warnings.
[fkooman@franek noarch]$

Comment 2 Itamar Reis Peixoto 2009-01-21 15:11:39 UTC
please don't gzip man pages.

gzip -9 %{buildroot}/usr/share/man/man1/diffuse.1

all files in /usr/share/man are magically gziped by rpm

please macronify your %files section

please replace all hardcoded paths below with macros.


for more info about macros please l@@k


Comment 3 Jon Levell 2009-01-21 23:25:05 UTC
I hope I've addressed all the comments. Updated files are:
Spec URL: http://coralbark.net/fedora/diffuse/diffuse.spec
SRPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-2.fc10.src.rpm
RPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-2.fc10.noarch.rpm

Comment 4 Itamar Reis Peixoto 2009-01-21 23:34:46 UTC
you're missing somethint in changelog

* Wed Jan 21 2009 Jon Levell <fedora> 0.2.15-2

should be something like this
* Wed Jan 21 2009 Jon Levell <fedora> - 0.2.15-2

Comment 5 Itamar Reis Peixoto 2009-01-21 23:36:55 UTC
macronify more.



Comment 6 Itamar Reis Peixoto 2009-01-21 23:38:41 UTC
change  from



Comment 7 Itamar Reis Peixoto 2009-01-21 23:41:01 UTC
fix your buildroot according with guidelines


Comment 8 Jon Levell 2009-01-24 11:03:38 UTC
Another update:
Spec URL: http://coralbark.net/fedora/diffuse/diffuse.spec
SRPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-3.fc10.src.rpm
RPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-3.fc10.noarch.rpm

I've addressed all the comments except for #5. I considered what you suggest when making the first "macronified" version but it seems funny to change: %{_bindir}/diffuse

If I'm not changing:

and I've not keen on making the second change - if we were changing the name of the program, there would be bigger issues than updating the files section.

If people feel strongly that I should make the suggested change I will. If so, should I change the diffuserc as well as:

Comment 9 Michael Schwendt 2009-02-07 21:43:13 UTC
> you're missing somethint in changelog

No. The first %changelog entry quoted in comment 4 is fine.

> macronify more.

No. The request in comment 5 leads to macro-madness. Only in some cases it is convenient to replace the program name with %{name} -- e.g. if you want to reuse a spec file for other packages. It doesn't happen often that a program changes its name frequently, so that using %name everywhere (even in URL and %files lists) would be justified.

* The guidelines want the .desktop file to be validated in the %install section:

* The guidelines include specific shell code for scrollkeeper-update and desktop-data-base usage:


* Several directories are not included in %files:

  %dir %{_datadir}/gnome/help/diffuse
  %dir %{_datadir}/gnome/help/diffuse/C
  %dir %{_datadir}/omf/diffuse


* Rest is good.

Comment 10 Jon Levell 2009-02-11 20:54:38 UTC
Another update:

Spec URL: http://coralbark.net/fedora/diffuse/diffuse.spec
SRPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-4.fc10.src.rpm
RPM URL: http://coralbark.net/fedora/diffuse/diffuse-0.2.15-4.fc10.noarch.rpm

I've addressed the points from comment #9. I can see that I was very naive when I initially submitted the spec file on the grounds that it seemed to work fine on the systems I installed it on.

Thanks Michael (and everyone else) for the helpful comments

Comment 11 Michael Schwendt 2009-02-14 18:52:57 UTC
Yes, lots of package spec files "out there" seem to work, but there are many packaging pitfalls, and suddenly the packages break in unexpected ways. ;-)


The packaging is fine now.

diffuse-0.2.15-4.fc10.src.rpm : APPROVED


I see you don't have any other review requests currently, and the NEEDSPONSOR keyword is set. What are your plans with regard to https://fedoraproject.org/wiki/PackageMaintainers/Join ?

Comment 12 Jon Levell 2009-02-21 21:28:11 UTC
Re: Comment #11

I've been giving some thought to my sponsorship request. I would like to be sponsored but I don't (at least initially) want to maintain many packages.

On the other hand, this package isn't very good evidence that I'm competent. Would a number of informal package reviews be enough?

Comment 13 Michael Schwendt 2009-02-21 21:55:51 UTC
Yes, good idea.

Comment 14 Jon Levell 2009-02-26 21:53:43 UTC
New Package CVS Request
Package Name:  diffuse
Short Description: Graphical tool for comparing and merging text files
Owners: jonquark
Branches: F-9 F-10 EL-5

Comment 15 Kevin Fenzi 2009-02-27 00:12:28 UTC
cvs done.

Comment 16 Fedora Update System 2009-03-01 10:44:54 UTC
diffuse-0.2.15-4.fc10 has been submitted as an update for Fedora 10.

Comment 17 Fedora Update System 2009-03-04 16:25:17 UTC
diffuse-0.2.15-4.fc10 has been pushed to the Fedora 10 testing repository.  If problems still persist, please make note of it in this bug report.
 If you want to test the update, you can install it with 
 su -c 'yum --enablerepo=updates-testing update diffuse'.  You can provide feedback for this update here: http://admin.fedoraproject.org/updates/F10/FEDORA-2009-2310

Comment 18 Fedora Update System 2009-03-11 17:59:33 UTC
diffuse-0.2.15-4.fc10 has been pushed to the Fedora 10 stable repository.  If problems still persist, please make note of it in this bug report.

Comment 19 Christopher Meng 2014-07-21 01:59:23 UTC
Package Change Request
Package Name: diffuse
New Branches: epel7
Owners: cicku

Comment 20 Gwyn Ciesla 2014-07-21 12:37:01 UTC
Git done (by process-git-requests).

Note You need to log in before you can comment on or make changes to this bug.