rpms/kdiff3/devel kdiff3part.desktop.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 kdiff3.spec, 1.12, 1.13 sources, 1.3, 1.4

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11958

Modified Files:
	.cvsignore kdiff3.spec sources 
Added Files:
	kdiff3part.desktop.diff 
Log Message:
Update to 0.9.93


kdiff3part.desktop.diff:

--- NEW FILE kdiff3part.desktop.diff ---
--- kdiff3-0.9.93/src-QT4/kdiff3part.desktop~	2008-10-26 17:55:20.000000000 -0400
+++ kdiff3-0.9.93/src-QT4/kdiff3part.desktop	2009-01-06 11:31:20.000000000 -0500
@@ -5,7 +5,6 @@
 Name[hi]=के-डिफ3पार्ट
 Name[sv]=Kdiff3-del
 Name[x-test]=xxKDiff3Partxx
-MimeType=text/x-diff;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkdiff3part
 Type=Service


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Nov 2007 01:57:35 -0000	1.3
+++ .cvsignore	6 Jan 2009 16:56:46 -0000	1.4
@@ -1 +1 @@
-kdiff3-0.9.92.tar.gz
+kdiff3-0.9.93.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdiff3.spec	5 Jun 2008 22:55:05 -0000	1.12
+++ kdiff3.spec	6 Jan 2009 16:56:46 -0000	1.13
@@ -1,13 +1,15 @@
 Name:           kdiff3
-Version:        0.9.92
-Release: 	14%{?dist}
+Version:        0.9.93
+Release: 	1%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
+Patch0:		kdiff3part.desktop.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gettext
 
 %if 0%{?rhel}
 BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
@@ -27,14 +29,14 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 %configure \
          --disable-rpath
 
-make %{?_smp_mflags}
+%{cmake_kde4}
 
 
 %install
@@ -48,6 +50,9 @@
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
+%find_lang %{name}plugin || touch %{name}.lang
+cat %{name}plugin.lang >> %{name}.lang
+
 # HTML (1.0)
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
 for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
@@ -65,21 +70,18 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/kde4/apps $RPM_BUILD_ROOT%{_datadir}/kde4/services
+
+desktop-file-install --vendor fedora \
+    --dir $RPM_BUILD_ROOT%{_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_datadir}/kde4/services/kdiff3part.desktop
 
 desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4  \
     --add-category Development \
     --add-category X-Fedora \
     --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
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdiff3.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,15 +97,17 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/kdiff3
-%{_libdir}/kde3/*
-%{_datadir}/applications/*
-%{_datadir}/apps/*
+%{_bindir}/*
+%{_libdir}/*
+%{_datadir}/applications/kde4/*
+%{_datadir}/kde4/apps/*
 %{_datadir}/icons/*/*/*/kdiff3.png
-%{_datadir}/services/*
-%{_mandir}/man1/kdiff3*
+%{_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1
+- Update to 0.9.93
+
 * Thu Jun 5 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.9.92-14
 - add a conditional BR, allowing build in EPEL-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Nov 2007 01:57:35 -0000	1.3
+++ sources	6 Jan 2009 16:56:46 -0000	1.4
@@ -1 +1 @@
-c7b52bfee6a085393de0c4f83732e8f0  kdiff3-0.9.92.tar.gz
+3f225daebc7f94e237d66edabf2e39ab  kdiff3-0.9.93.tar.gz