rpms/kdiff3/devel kdiff3-0.9.95-docbook_fixes.patch, NONE, 1.1 kdiff3.spec, 1.28, 1.29

Rex Dieter rdieter at fedoraproject.org
Tue Jul 13 22:29:46 UTC 2010 

Author: rdieter

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11457

Modified Files:
	kdiff3.spec 
Added Files:
	kdiff3-0.9.95-docbook_fixes.patch 
Log Message:
* Tue Jul 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.95-5
- ftbfs against kde-4.5 (pre)releases
- optimize scriplets
- drop HTML doc hackery, use %find_lang --with-kde


kdiff3-0.9.95-docbook_fixes.patch:
 de/index.docbook |    2 +-
 fr/index.docbook |    2 +-
 it/index.docbook |    2 +-
 nl/index.docbook |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE kdiff3-0.9.95-docbook_fixes.patch ---
diff -up kdiff3-0.9.95/doc/de/index.docbook.rex kdiff3-0.9.95/doc/de/index.docbook
--- kdiff3-0.9.95/doc/de/index.docbook.rex	2009-01-01 16:52:33.000000000 -0600
+++ kdiff3-0.9.95/doc/de/index.docbook	2010-07-13 16:47:24.976466592 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kdiff3 "<application
 >KDiff3</application
 >">
diff -up kdiff3-0.9.95/doc/en/index.docbook.rex kdiff3-0.9.95/doc/en/index.docbook
diff -up kdiff3-0.9.95/doc/fr/index.docbook.rex kdiff3-0.9.95/doc/fr/index.docbook
--- kdiff3-0.9.95/doc/fr/index.docbook.rex	2009-01-01 16:52:33.000000000 -0600
+++ kdiff3-0.9.95/doc/fr/index.docbook	2010-07-13 16:47:30.490454222 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kdiff3 "<application
 >KDiff3</application
 >">
diff -up kdiff3-0.9.95/doc/it/index.docbook.rex kdiff3-0.9.95/doc/it/index.docbook
--- kdiff3-0.9.95/doc/it/index.docbook.rex	2009-01-01 16:52:33.000000000 -0600
+++ kdiff3-0.9.95/doc/it/index.docbook	2010-07-13 16:47:38.782454037 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kdiff3 "<application
 >KDiff3</application
 >">
diff -up kdiff3-0.9.95/doc/nl/index.docbook.rex kdiff3-0.9.95/doc/nl/index.docbook
--- kdiff3-0.9.95/doc/nl/index.docbook.rex	2009-01-01 16:52:33.000000000 -0600
+++ kdiff3-0.9.95/doc/nl/index.docbook	2010-07-13 16:47:13.956454233 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kdiff3 "<application
 >KDiff3</application
 >">


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kdiff3.spec	28 Mar 2010 18:32:14 -0000	1.28
+++ kdiff3.spec	13 Jul 2010 22:29:46 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.95
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch0:         kdiff3part.desktop.diff
 # Install kdiff3_part.rc into correct location
 Patch1:		kdiff3part.rc.diff
+# fix build against kde-4.5 (pre)releases
+Patch2:		kdiff3-0.9.95-docbook_fixes.patch     
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -32,6 +35,7 @@ KDiff3 is a program that
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .docbook_fixes
 
 %build
 mkdir -p %{_target_platform}
@@ -39,7 +43,7 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -47,34 +51,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=%{_kde4_docdir}/HTML
-
 # locale's
-%find_lang %{name} || touch %{name}.lang
-%find_lang %{name}plugin || touch %{name}.lang
+%find_lang %{name} --with-kde || touch %{name}.lang
+%find_lang %{name}plugin || touch %{name}plugin.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
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
 # Desktop.
-desktop-file-install --vendor="" \
-    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
-    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
-
 desktop-file-install  --vendor="" \
     --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
     --add-category=Development \
@@ -86,16 +68,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor || :
-touch --no-create %{_kde4_iconsdir}/locolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 
 %postun
-touch --no-create %{_kde4_iconsdir}/hicolor || :
-touch --no-create %{_kde4_iconsdir}/locolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 
 
 %files -f %{name}.lang
@@ -103,7 +91,7 @@ touch --no-create %{_kde4_iconsdir}/loco
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/kdiff3
 %{_kde4_libdir}/kde4/libkdiff3*.so
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/kdiff3/
 %{_kde4_appsdir}/kdiff3part/
 %{_kde4_iconsdir}/hicolor/*/*/kdiff3.png
@@ -112,6 +100,11 @@ touch --no-create %{_kde4_iconsdir}/loco
 
 
 %changelog
+* Tue Jul 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.95-5
+- ftbfs against kde-4.5 (pre)releases
+- optimize scriplets
+- drop HTML doc hackery, use %%find_lang --with-kde
+
 * Sun Mar 28 2010 Neal Becker <ndbecker2 at gmail.com> - 0.9.95-4
 - Install kdiff3_part.rc into correct location

More information about the scm-commits mailing list