rpms/k3b/devel k3b.spec,1.79,1.80

[Rex Dieter]

Author: rdieter

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

Modified Files:
	k3b.spec 
Log Message:
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-2
- -common (noarch) subpkg handling
- -libs: add min runtime deps for qt4/kdelibs4



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- k3b.spec	15 Oct 2009 14:20:13 -0000	1.79
+++ k3b.spec	26 Oct 2009 12:53:33 -0000	1.80
@@ -1,22 +1,27 @@
 
+# include sub pkgs
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+# no real need to enable this until we get some translations
+#define common 1
+%endif
+
 %define pre alpha3
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
 Version: 1.68.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org/
 Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# TODO: bugzilla/document
+# ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
 # FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
-# FIXME/TODO: sync -common changes from F-12
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -34,7 +39,17 @@ BuildRequires: libvorbis-devel
 #BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+# Check if we want this:
+#Requires: kdebase-runtime >= %{_kde4_version}
+
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+%if 0%{?common}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%else
+Obsoletes: %{name}-common < %{epoch}:%{version}-%{release}
+Provides:  %{name}-common = %{epoch}:%{version}-%{release}
+%endif
 
 Requires: cdrecord mkisofs
 Requires(hint): cdrdao
@@ -47,10 +62,20 @@ steps of the burning process the beginne
 automatic settings and the reasonable k3b defaults which allow a quick
 start.
 
+%package common
+Summary:  Common files of %{name}
+Group:    Applications/Archiving
+Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildArch: noarch
+%description common
+{summary}.
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 %description libs
 %{summary}.
 
@@ -82,6 +107,9 @@ make %{?_smp_mflags} -C %{_target_platfo
 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
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k3b.desktop
@@ -95,25 +123,29 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
 
-%postun
+%postun %{?common:common}
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 fi
 
+%posttrans %{?common:common}
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 
-%files 
+
+%files %{?!common:-f all.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
+%endif
 %{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
 %{_kde4_appsdir}/solid/actions/*.desktop
@@ -124,7 +156,6 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
 %{_kde4_datadir}/sounds/k3b_*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/*.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -137,6 +168,10 @@ fi
 
 
 %changelog
+* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-2
+- -common (noarch) subpkg handling
+- -libs: add min runtime deps for qt4/kdelibs4
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-1
 - k3b-1.68.0 (alpha3)