rpms/kdeaccessibility/F-10 kdeaccessibility.spec,1.67,1.68

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22180/F-10

Modified Files:
	kdeaccessibility.spec 
Log Message:
kde-4.3.0



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdeaccessibility.spec	29 May 2009 13:25:20 -0000	1.67
+++ kdeaccessibility.spec	5 Aug 2009 02:49:19 -0000	1.68
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.2.4
-Release:        1%{?dist}
+Version:        4.3.0
+Release:        3%{?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,11 +25,12 @@ 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: kdelibs4 >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# ktssd
+Requires: festival
 
-Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+Obsoletes: kdeaccessibility-devel < 1:3.5.8
+Obsoletes: kdeaccessibility < 1:4.3.0-2
 
 #noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
@@ -40,13 +42,22 @@ 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} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -60,30 +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,18 +134,45 @@ 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
-* Fri May 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1: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> - 1:4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.2.90-1
+- KDE 4.3 beta 2
+
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- Requires: festival (for kttsd)
 
 * Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2