rpms/kdiff3/F-7 kdiff3.spec,1.2,1.3
Neal Becker (nbecker)
fedora-extras-commits at redhat.com
Sun Dec 2 19:44:39 UTC 2007
Author: nbecker
Update of /cvs/pkgs/rpms/kdiff3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27614
Modified Files:
kdiff3.spec
Log Message:
fix mock build
Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-7/kdiff3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdiff3.spec 4 Oct 2006 22:21:04 -0000 1.2
+++ kdiff3.spec 2 Dec 2007 19:44:05 -0000 1.3
@@ -1,15 +1,15 @@
Name: kdiff3
-Version: 0.9.90
-Release: 7%{?dist}
+Version: 0.9.92
+Release: 11%{?dist}
Summary: Compare + merge 2 or 3 files or directories
Group: Development/Tools
-License: GPL
+License: GPLv2
URL: http://kdiff3.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase-devel, kdelibs-devel, desktop-file-utils
+BuildRequires: kdebase3-devel, kdelibs3-devel, desktop-file-utils, qt-devel
%description
KDiff3 is a program that
@@ -26,6 +26,7 @@
%build
+unset QTDIR || : ; source /etc/profile.d/qt.sh
%configure \
%ifarch x86_64 \
--enable-libsuffix=64 \
@@ -72,6 +73,12 @@
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
+echo "NoDisplay=true" >> \
+$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+desktop-file-install --vendor="" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -95,8 +102,21 @@
%{_datadir}/services/*
%{_mandir}/man1/kdiff3*
-
%changelog
+* Sun Dec 2 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-11
+- BR qt-devel
+- source /etc/profile.d/qt.sh for mock
+
+* Wed Nov 7 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-10
+- Update desktop-file-install as suggest by Rex
+
+* Wed Nov 7 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-8
+- Use desktop-file-install for kdiff3plugin.desktop
+
+* Tue Nov 6 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-7
+- Update to 0.9.92
+- Add /usr/share/applnk/.hidden/kdiff3plugin.desktop
+
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.90-7
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
More information about the fedora-extras-commits
mailing list