rpms/k3b/F-13 .cvsignore, 1.27, 1.28 k3b.spec, 1.90, 1.91 sources, 1.28, 1.29

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13263

Modified Files:
	.cvsignore k3b.spec sources 
Log Message:
* Sat May 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:1.92.0-1
- k3b-1.92.0 (rc3)
- enable -common noarch content



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	13 Mar 2010 22:40:54 -0000	1.27
+++ .cvsignore	23 May 2010 18:56:23 -0000	1.28
@@ -1 +1 @@
-k3b-1.91.0rc2.tar.bz2
+k3b-1.92.0rc3.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/k3b.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- k3b.spec	24 Mar 2010 14:25:14 -0000	1.90
+++ k3b.spec	23 May 2010 18:56:23 -0000	1.91
@@ -1,28 +1,26 @@
 
 # include sub pkgs
 %if 0%{?fedora} > 9 || 0%{?rhel} > 5
-# no real need to enable this until we get some translations
-#define common 1
+%define common 1
 %endif
 
-%define pre rc2
+%define pre rc3
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
-Version: 1.91.0
-Release: 2%{?dist}
+Version: 1.92.0
+Release: 1%{?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)
+
 # 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
-
 BuildRequires: desktop-file-utils
 BuildRequires: flac-devel
 BuildRequires: gettext
@@ -38,7 +36,6 @@ BuildRequires: libvorbis-devel
 #BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
 
-# Check if we want this:
 Requires: kdebase-runtime%{?_kde_version: >= %{_kde4_version}}
 
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@@ -94,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  -DK3B_BUILD_K3BSETUP=OFF \
+  -DK3B_BUILD_K3BSETUP:BOOL=OFF \
   ..
 popd
 
@@ -103,9 +100,17 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
+
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang k3b --all-name --with-kde || touch k3b.lang
+%find_lang k3b --with-kde
+%find_lang libk3b
+%find_lang libk3bdevice 
+cat libk3bdevice.lang >> libk3b.lang
+
+## unpackaged files
+# k3bsetup crud
+rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/k3bsetup.mo
 
 
 %check
@@ -120,38 +125,38 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
-%postun %{?common:common}
+%postun
 if [ $1 -eq 0 ] ; then
 update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
-%posttrans %{?common:common}
+%posttrans
 update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files %{?!common:-f k3b.lang}
+%files %{?!common: -f k3b.lang}
 %defattr(-,root,root,-)
 %doc README COPYING TODO ChangeLog
 %{_kde4_bindir}/k3b
 %{_kde4_libdir}/kde4/*.so
-
-%if 0%{?common}
-%files common -f k3b.lang
-%endif
-%{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
-%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_appsdir}/solid/actions/k3b*.desktop
 %{_kde4_datadir}/applications/kde4/k3b.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
 %{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
-%{_kde4_datadir}/sounds/k3b_*
 %{_kde4_datadir}/mime/packages/x-k3b.xml
 
-%files libs
+%if 0%{?common}
+%files common -f k3b.lang
+%endif
+%{_kde4_appsdir}/k3b/
+%{_kde4_datadir}/sounds/k3b_*
+
+%files libs -f libk3b.lang
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libk3bdevice.so.6*
 %{_kde4_libdir}/libk3blib.so.6*
@@ -164,6 +169,10 @@ update-mime-database %{_kde4_datadir}/mi
 
 
 %changelog
+* Sat May 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:1.92.0-1
+- k3b-1.92.0 (rc3)
+- enable -common noarch content
+
 * Sat Mar 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:1.91.0-2
 - Requires: kdebase-runtime
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	13 Mar 2010 22:40:55 -0000	1.28
+++ sources	23 May 2010 18:56:23 -0000	1.29
@@ -1 +1 @@
-56d1c726a2771d341f59f08d5364d141  k3b-1.91.0rc2.tar.bz2
+65372e9f2826165071b24c9f1d17882b  k3b-1.92.0rc3.tar.bz2