rpms/kdiff3/EL-5 kdiff3.spec,1.2,1.3 sources,1.2,1.3

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3589

Modified Files:
	kdiff3.spec sources 
Log Message:
init



Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/EL-5/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	6 Jun 2008 15:50:12 -0000	1.3
@@ -1,15 +1,19 @@
 Name:           kdiff3
-Version:        0.9.90
-Release: 7%{?dist}
+Version:        0.9.92
+Release: 	14%{?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)
 
+%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
@@ -26,10 +30,8 @@
 
 
 %build
+unset QTDIR || : ; source /etc/profile.d/qt.sh
 %configure \
-        %ifarch x86_64 \
-        --enable-libsuffix=64 \
-        %endif \
          --disable-rpath
 
 make %{?_smp_mflags}
@@ -72,6 +74,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 +103,31 @@
 %{_datadir}/services/*
 %{_mandir}/man1/kdiff3*
 
-
 %changelog
+* Thu Jun 5 2008 Manuel 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)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.92-12
+- Autorebuild for GCC 4.3
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 20:18:56 -0000	1.2
+++ sources	6 Jun 2008 15:50:12 -0000	1.3
@@ -1 +1 @@
-7224d636e1f1fa577abfbc17192e71bd  kdiff3-0.9.90.tar.gz
+c7b52bfee6a085393de0c4f83732e8f0  kdiff3-0.9.92.tar.gz