rpms/kdiff3/devel kdiff3.spec,1.9,1.10
Neal Becker (nbecker)
fedora-extras-commits at redhat.com
Thu Jun 5 22:49:15 UTC 2008
Author: nbecker
Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676
Modified Files:
kdiff3.spec
Log Message:
Patch to support EPEL
Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdiff3.spec 25 Mar 2008 15:00:03 -0000 1.9
+++ kdiff3.spec 5 Jun 2008 22:48:29 -0000 1.10
@@ -1,6 +1,6 @@
Name: kdiff3
Version: 0.9.92
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Compare + merge 2 or 3 files or directories
Group: Development/Tools
@@ -9,7 +9,11 @@
Source0: http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel}
+BuildRequires: kdebase-devel, kdelibs-devel, desktop-file-utils
+%else
BuildRequires: kdebase3-devel, kdelibs3-devel, desktop-file-utils
+%endif
%description
KDiff3 is a program that
@@ -100,6 +104,9 @@
%{_mandir}/man1/kdiff3*
%changelog
+* Thu June 5 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.92-14
+- add a conditional BR, allowing build in EPEL-5
+
* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.92-13
- drop BR: qt-devel (broken)
- omit 64bit configure hack (invalid and not needed)
More information about the scm-commits
mailing list