rpms/kdeaccessibility/devel kdeaccessibility.spec,1.87,1.88

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
- %check: desktop-file-validate



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdeaccessibility.spec	29 Jul 2009 22:06:46 -0000	1.87
+++ kdeaccessibility.spec	1 Aug 2009 22:38:20 -0000	1.88
@@ -2,7 +2,7 @@ Summary:        K Desktop Environment - 
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -11,6 +11,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
@@ -24,13 +25,13 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: kdelibs4 >= %{version}
 # ktssd
 Requires: festival
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8
+Obsoletes: kdeaccessibility < 1:4.3.0-2
 
 #noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
@@ -42,6 +43,15 @@ Included with this package are:
 * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
+# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
+# but that's how multilib currently works. -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
@@ -61,29 +71,49 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kmousetool kmouth kttsd ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
+# unpackaged files
+rm -vf %{buildroot}%{_kde4_libdir}/libkttsd.so
+
+
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
-    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -95,7 +125,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/kttsd/
 %{_kde4_appsdir}/color-schemes/*.colors
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/kmag/
@@ -104,13 +134,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_docdir}/HTML/en/kttsd/
 %{_kde4_iconsdir}/mono/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
-%{_mandir}/*/*.gz
+%{_mandir}/man1/*.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkttsd.so.4*
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0