rpms/beediff/F-9 beediff.desktop, NONE, 1.1 beediff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Terje Røsten]

Author: terjeros

Update of /cvs/extras/rpms/beediff/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3957

Modified Files:
	.cvsignore sources 
Added Files:
	beediff.desktop beediff.spec 
Log Message:
Importing beediff.




--- NEW FILE beediff.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beediff
Comment=Compare and merge text files
Exec=beediff
Terminal=false
Type=Application
Icon=beediff
Categories=Development;TextTools;Qt;



--- NEW FILE beediff.spec ---
Summary:       Visual tool for comparing and merging files
Name:          beediff
Version:       1.9
Release:       2%{?dist}
Group:         Development/Tools
License:       GPLv2+
URL:           http://www.beesoft.at/index.php?id=beediff
Source0:       http://www.beesoft.at/download/beediff_%{version}_src.tar.gz
Source1:       beediff.desktop
BuildRequires: qt4-devel desktop-file-utils
Requires:      diffutils
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
This package provides a visual application (beediff) for comparing and
merging files. User have a possibility to work with two text
files. Every one is in separate panel. Panels are side by side. All
differences of both textes are highlighted in colors. Operation
buttons (merge, remove) are located direct inside compared textes in
appropriate positions. Program is user friendly, very simply and
efficient.

%prep
%setup -q -n %{name}
%{__sed} -i.bak -e 's/^QMAKE_CXXFLAGS_RELEASE.*/QMAKE_CXXFLAGS_RELEASE = %{optflags}/' beediff.pro

%build
qmake-qt4
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__install} -D -m 0755 %{name}  %{buildroot}%{_bindir}/%{name}
%{__install} -D -p -m 0644 img/%{name}.png  \
    %{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc licence.txt ChangeLog.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Mon Sep 22 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.9-2
- fix license
- move desktop file
- add smp flags

* Wed Sep 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.9-1
- initial package

 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beediff/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Oct 2008 20:30:23 -0000	1.1
+++ .cvsignore	24 Oct 2008 14:59:37 -0000	1.2
@@ -0,0 +1 @@
+beediff_1.9_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beediff/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Oct 2008 20:30:23 -0000	1.1
+++ sources	24 Oct 2008 14:59:37 -0000	1.2
@@ -0,0 +1 @@
+be89d5d512920347ad04ef76dd8458a7  beediff_1.9_src.tar.gz