rpms/diffuse/F-10 diffuse-0.2.15-desktop.patch, NONE, 1.1 diffuse.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jon Levell]

Author: jonquark

Update of /cvs/pkgs/rpms/diffuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7026/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	diffuse-0.2.15-desktop.patch diffuse.spec import.log 
Log Message:
Initial import for F10


diffuse-0.2.15-desktop.patch:

--- NEW FILE diffuse-0.2.15-desktop.patch ---
diff -uNr diffuse-0.2.15/src/usr/share/applications/diffuse.desktop diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop
--- diffuse-0.2.15/src/usr/share/applications/diffuse.desktop	2008-12-02 13:04:30.000000000 +0000
+++ diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop	2009-01-21 23:03:42.000000000 +0000
@@ -5,5 +5,5 @@
 Icon=diffuse
 Terminal=false
 Type=Application
-MimeType=text/plain;text/x-csrc;text/x-chdr
-Categories=Development;GTK;TextEditor;TextTools
+MimeType=text/plain;text/x-csrc;text/x-chdr;
+Categories=Development;GTK;TextEditor;TextTools;


--- NEW FILE diffuse.spec ---
Name: diffuse
Version: 0.2.15
Release: 4%{?dist}
Summary: Graphical tool for comparing and merging text files

Group: Development/Tools
License: GPLv2+
URL: http://%{name}.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Patch0: diffuse-0.2.15-desktop.patch

BuildRequires: desktop-file-utils, scrollkeeper
Requires: python >= 2.4, pygtk2 >= 2.10
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

BuildArch: noarch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
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.

%prep
%setup -q
%patch0 -p1

%build

%install
rm -rf %{buildroot}
mkdir %{buildroot}
cp -a src/* %{buildroot}/
desktop-file-validate %{buildroot}/%{_datadir}/applications/diffuse.desktop


%clean
rm -rf %{buildroot}

%post
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
update-desktop-database &> /dev/null || :

%postun
scrollkeeper-update -q || :
update-desktop-database &> /dev/null || :


%files
%defattr(-,root,root,-)
%{_bindir}/diffuse
%{_datadir}/diffuse/
%{_datadir}/applications/diffuse.desktop
%{_datadir}/gnome/help/diffuse/C/diffuse.xml
%{_datadir}/omf/diffuse/diffuse-C.omf
%{_datadir}/pixmaps/diffuse.png
%config(noreplace) %{_sysconfdir}/diffuserc
%{_mandir}/man*/*
%dir %{_datadir}/gnome/help/diffuse
%dir %{_datadir}/gnome/help/diffuse/C
%dir %{_datadir}/omf/diffuse

%doc AUTHORS ChangeLog COPYING README TODO

%changelog

* Wed Feb 11 2009 Jon Levell <fedora at coralbark.net> - 0.2.15-4
- Validate the .desktop file
- Use the prescribed forms for scrollkeeper/update-desktop-database
- Clean up the unowned directories

* Sat Jan 24 2009 Jon Levell <fedora at coralbark.net> - 0.2.15-3
- Fix typos in formatting of changelog
- Fix buildroot in line with packaging guidelines
- Updated defattr with default directory permissions

* Wed Jan 21 2009 Jon Levell <fedora at coralbark.net> - 0.2.15-2
- Use macros in file paths
- patch .desktop file to add trailing semi-colons
- updated URL/source/group

* Tue Jan 20 2009 Jon Levell <fedora at coralbark.net> - 0.2.15-1
- clean buildroot on install
- conditional use scrollkeeper/update-desktop-database
- updated release/license as per Fedora guidelines
- first version submitted to Fedora

* Sun Apr 27 2008 Derrick Moser <derrick_moser at yahoo.com>
- created initial diffuse package


--- NEW FILE import.log ---
diffuse-0_2_15-4_fc10:F-10:diffuse-0.2.15-4.fc10.src.rpm:1235855234


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Feb 2009 00:12:58 -0000	1.1
+++ .cvsignore	28 Feb 2009 21:08:49 -0000	1.2
@@ -0,0 +1 @@
+diffuse-0.2.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Feb 2009 00:12:58 -0000	1.1
+++ sources	28 Feb 2009 21:08:50 -0000	1.2
@@ -0,0 +1 @@
+0fd7aa7d3ed7271770d36bfac8b1ba42  diffuse-0.2.15.tar.bz2