rpms/kmediafactory/devel kmediafactory-0.8.0-docbook_fix.patch, NONE, 1.1 kmediafactory-0.8.0-dso.patch, NONE, 1.1 kmediafactory-0.8.0-mlt-melt.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 kmediafactory.spec, 1.8, 1.9 sources, 1.4, 1.5

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/kmediafactory/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32125

Modified Files:
	.cvsignore kmediafactory.spec sources 
Added Files:
	kmediafactory-0.8.0-docbook_fix.patch 
	kmediafactory-0.8.0-dso.patch 
	kmediafactory-0.8.0-mlt-melt.patch 
Log Message:
* Mon Jun 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-1
- kmediafactory-0.8.0
- optimize scriptlets


kmediafactory-0.8.0-docbook_fix.patch:
 index.docbook |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kmediafactory-0.8.0-docbook_fix.patch ---
diff -up kmediafactory-0.8.0/doc/en/index.docbook.fix kmediafactory-0.8.0/doc/en/index.docbook
--- kmediafactory-0.8.0/doc/en/index.docbook.fix	2010-04-08 09:00:02.000000000 -0500
+++ kmediafactory-0.8.0/doc/en/index.docbook	2010-06-14 15:11:46.975790776 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kmediafactory "<application>KMediaFactory 0.6</application>">
   <!ENTITY kappname "&kmediafactory;"><!-- Do *not* replace kappname-->
   <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->

kmediafactory-0.8.0-dso.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kmediafactory-0.8.0-dso.patch ---
diff -up kmediafactory-0.8.0/src/CMakeLists.txt.dso kmediafactory-0.8.0/src/CMakeLists.txt
--- kmediafactory-0.8.0/src/CMakeLists.txt.dso	2010-04-08 09:00:02.000000000 -0500
+++ kmediafactory-0.8.0/src/CMakeLists.txt	2010-06-14 15:15:31.337790709 -0500
@@ -35,7 +35,7 @@ qt4_add_dbus_adaptor(kmediafactory_SRCS 
 kde4_add_kcfg_files(kmediafactory_SRCS kmediafactorysettings.kcfgc)
 kde4_add_executable(kmediafactory ${kmediafactory_SRCS})
 if (KDE_4_4)
-target_link_libraries(kmediafactory kmf kmediafactoryinterfaces ${KDE4_KNEWSTUFF3_LIBS} ${QT_QTWEBKIT_LIBRARY})
+target_link_libraries(kmediafactory kmf kmediafactoryinterfaces ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KIO_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} ${X11_X11_LIB} )
 else (KDE_4_4)
 target_link_libraries(kmediafactory kmf kmediafactoryinterfaces ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTWEBKIT_LIBRARY})
 endif (KDE_4_4)

kmediafactory-0.8.0-mlt-melt.patch:
 CMakeLists.txt                        |    4 ++--
 plugins/slideshow/slideshowplugin.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kmediafactory-0.8.0-mlt-melt.patch ---
diff -up kmediafactory-0.8.0/CMakeLists.txt.mlt-melt kmediafactory-0.8.0/CMakeLists.txt
--- kmediafactory-0.8.0/CMakeLists.txt.mlt-melt	2010-04-08 09:00:02.000000000 -0500
+++ kmediafactory-0.8.0/CMakeLists.txt	2010-06-14 14:53:56.861790743 -0500
@@ -64,8 +64,8 @@ macro_bool_to_01(LIBDVDREAD_FOUND HAVE_L
 find_program(DVDSLIDESHOW_EXECUTABLE dvd-slideshow)
 macro_log_feature(DVDSLIDESHOW_EXECUTABLE "dvd-slideshow" "For making slideshows" "http://dvd-slideshow.sourceforge.net/wiki/Main_Page" FALSE "" "")
 
-find_program(MELT_EXECUTABLE melt)
-macro_log_feature(MELT_EXECUTABLE "melt" "For making slideshows" "http://www.mltframework.org/" FALSE "" "")
+find_program(MELT_EXECUTABLE mlt-melt)
+macro_log_feature(MELT_EXECUTABLE "mlt-melt" "For making slideshows" "http://www.mltframework.org/" FALSE "" "")
 
 find_program(K3B_EXECUTABLE k3b)
 macro_log_feature(K3B_EXECUTABLE "k3b" "For burning DVDs" "http://www.k3b.org/" FALSE "" "")
diff -up kmediafactory-0.8.0/plugins/slideshow/slideshowplugin.cpp.mlt-melt kmediafactory-0.8.0/plugins/slideshow/slideshowplugin.cpp
--- kmediafactory-0.8.0/plugins/slideshow/slideshowplugin.cpp.mlt-melt	2010-04-08 09:00:01.000000000 -0500
+++ kmediafactory-0.8.0/plugins/slideshow/slideshowplugin.cpp	2010-06-14 14:54:54.970790884 -0500
@@ -83,7 +83,7 @@ void SlideshowPlugin::init(const QString
     }
 
     if (type.left(3) == "DVD") {
-        m_app = KStandardDirs::findExe("melt");
+        m_app = KStandardDirs::findExe("mlt-melt");
 
         if (m_app.isEmpty()) {
             m_app = KStandardDirs::findExe("dvd-slideshow");


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Apr 2009 08:40:13 -0000	1.4
+++ .cvsignore	14 Jun 2010 20:21:32 -0000	1.5
@@ -1 +1 @@
-kmediafactory-0.7.1.tar.bz2
+kmediafactory-0.8.0.tar.bz2


Index: kmediafactory.spec
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/kmediafactory.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kmediafactory.spec	14 Jun 2010 19:38:28 -0000	1.8
+++ kmediafactory.spec	14 Jun 2010 20:21:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kmediafactory
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A template based DVD authoring tool
 
 Group:          User Interface/Desktops
@@ -9,26 +9,37 @@
 Source0:        http://kmediafactory.googlecode.com/files/kmediafactory-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kde-filesystem >= 4
+# rpmfusion's mlt binary is named mlt-melt:
+Patch1: kmediafactory-0.8.0-mlt-melt.patch
+
+## upstreamable patches
+Patch50: kmediafactory-0.8.0-docbook_fix.patch
+Patch51: kmediafactory-0.8.0-dso.patch
+
 BuildRequires:  kdelibs4-devel
-BuildRequires:  cmake
 BuildRequires:  dvdauthor
+BuildRequires:  dvd-slideshow
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  giflib-devel
 BuildRequires:  libdvdread-devel 
+BuildRequires:  mlt
 BuildRequires:  mjpegtools 
 BuildRequires:  pcre-devel
 BuildRequires:  zip 
-# qt4-devel is pulled in by kdelibs4-devel already,
-# but we need a versioned BR
-BuildRequires:  qt4-devel >= 4.4
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires:       oxygen-icon-theme
+
 # needed for normal functionality
-Requires: dvdauthor mjpegtools mplayer ffmpeg
+Requires: dvdauthor
+Requires: dvd-slideshow
+Requires: ffmpeg
+Requires: mjpegtools
+Requires: mplayer
+# optional bits
+#Requires(hint): mlt
 
 %description
 Kmediafactory is an easy to use template based dvd authoring tool. 
@@ -45,7 +56,7 @@
 %package devel
 Summary: Development files for kmediafactory
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 Development files for %{name}.
 
@@ -53,6 +64,11 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .mlt-melt
+%patch50 -p1
+%patch51 -p1 -b .dso
+
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -64,55 +80,54 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # validate desktop file
 desktop-file-install --vendor=""                          \
         --dir %{buildroot}%{_kde4_datadir}/applications/kde4   \
         --remove-category="Application"                   \
         --add-category="X-OutputGeneration"               \
-        %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+        %{buildroot}%{_kde4_datadir}/applications/kde4/kmediafactory.desktop
 
 # locale
-%find_lang %{name}
+%find_lang kmediafactory --with-kde
+%find_lang kmediafactory_kstore
 %find_lang kmediafactory_output
 %find_lang kmediafactory_slideshow
 %find_lang kmediafactory_template
 %find_lang kmediafactory_video
 %find_lang libkmf
-%find_lang kmediafactory_kstore
-cat *.lang > %{name}-all.lang
+cat kmediafactory*.lang > kmediafactory-all.lang
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
-/sbin/ldconfig ||:
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+
+%postun
+if [ $1 -eq 0 ]; then
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/oxygen || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/oxygen || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%postun
-/sbin/ldconfig ||:
+%posttrans
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/oyxgen || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/oxygen || :
-fi
+gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 
-%files -f %{name}-all.lang
+%files -f kmediafactory-all.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README TODO
-%{_kde4_docdir}/HTML/en/kmediafactory/
 %{_kde4_bindir}/kmediafactory
 %{_kde4_appsdir}/kmediafactory/
 %{_kde4_appsdir}/kmediafactory_template/
@@ -121,16 +136,17 @@
 %{_kde4_datadir}/config/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-# consider moving to hicolor -- Rex
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/kmediafactory_*
 %{_kde4_libdir}/kde4/plugins/designer/kmfwidgets.so
 %{_kde4_datadir}/applications/kde4/kmediafactory.desktop
 %{_datadir}/mime/packages/kmediafactory.xml
 
-%files libs
+%files libs -f libkmf.lang
 %defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkmediafactoryinterfaces.so.0*
+%{_kde4_libdir}/libkmediafactorykstore.so.0*
+%{_kde4_libdir}/libkmf.so.0*
 
 %files devel
 %defattr(-,root,root,-)
@@ -139,6 +155,10 @@
 
 
 %changelog
+* Mon Jun 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-1
+- kmediafactory-0.8.0
+- optimize scriptlets
+
 * Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 0.7.1-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Apr 2009 08:40:13 -0000	1.4
+++ sources	14 Jun 2010 20:21:32 -0000	1.5
@@ -1 +1 @@
-ba7c87b05cfbce28e11a5381a7e7ed99  kmediafactory-0.7.1.tar.bz2
+e3621dffd97a45acd6ff883181d6e106  kmediafactory-0.8.0.tar.bz2