rpms/k3b/devel k3b.spec,1.82,1.83

Rex Dieter rdieter at fedoraproject.org
Thu Dec 10 16:54:59 UTC 2009


Author: rdieter

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

Modified Files:
	k3b.spec 
Log Message:
fix build



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- k3b.spec	10 Dec 2009 15:30:28 -0000	1.82
+++ k3b.spec	10 Dec 2009 16:54:59 -0000	1.83
@@ -75,7 +75,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: qt4%{?_isa} >= %{_qt4_version}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
 
@@ -108,7 +108,6 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang k3b --with-kde || touch k3b.lang
-cat k3b*.lang > all.lang
 
 
 %check
@@ -130,21 +129,23 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans %{?common:common}
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files %{?!common:-f all.lang}
+%files %{?!common:-f k3b.lang}
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_kde4_bindir}/k3b
 %{_kde4_libdir}/kde4/*.so
 
 %if 0%{?common}
-%files common -f all.lang
+%files common -f k3b.lang
 %endif
 %{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
@@ -156,6 +157,7 @@ update-desktop-database -q &> /dev/null
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
 %{_kde4_datadir}/sounds/k3b_*
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_datadir}/mime/packages/x-k3b.xml
 
 %files libs
 %defattr(-,root,root,-)




More information about the fedora-extras-commits mailing list