rpms/kdemultimedia/devel .cvsignore, 1.55, 1.56 kdemultimedia.spec, 1.123, 1.124 sources, 1.57, 1.58

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8547

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.2 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	27 Sep 2008 02:06:51 -0000	1.55
+++ .cvsignore	20 Nov 2008 15:06:27 -0000	1.56
@@ -1 +1,2 @@
 kdemultimedia-4.1.2.tar.bz2
+kdemultimedia-4.1.80.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdemultimedia.spec	29 Sep 2008 16:33:43 -0000	1.123
+++ kdemultimedia.spec	20 Nov 2008 15:06:27 -0000	1.124
@@ -1,7 +1,6 @@
-
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.2
+Version: 4.1.80
 Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -17,11 +16,8 @@
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: cmake
 BuildRequires: flac-devel
 BuildRequires: giflib-devel
-BuildRequires: kde-filesystem >= 4
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libtheora-devel
@@ -54,10 +50,7 @@
 License: LGPLv2+ and GPLv2+
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} 
-
-# force replacing old standalone dragonplayer with the main package
-# otherwise, dragonplayer conflicts with this over dragonpart.so
+Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Conflicts: dragonplayer < 2.0.2-0.1
 
 %description libs
@@ -65,7 +58,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 License:  LGPLv2+ and GPLv2+
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdebase-workspace-devel
@@ -79,7 +72,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -90,7 +83,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -120,6 +113,8 @@
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
 %{_kde4_appsdir}/profiles/*
+%{_kde4_appsdir}/kscd/skin/
+%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -132,6 +127,7 @@
 %{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
+%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -149,6 +145,17 @@
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem
@@ -157,7 +164,7 @@
 - 4.1.2
 
 * Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
-- backport from trunk to fix dragon kpart crash in the embedding application 
+- backport from trunk to fix dragon kpart crash in the embedding application
 
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Sep 2008 02:06:51 -0000	1.57
+++ sources	20 Nov 2008 15:06:27 -0000	1.58
@@ -1 +1 @@
-232001bb20ad40d039c99a86360705db  kdemultimedia-4.1.2.tar.bz2
+65e44c87a7f3cc0ffebe3998683f22ee  kdemultimedia-4.1.80.tar.bz2