12:50 p.m.
Author: rdieter
Update of /cvs/free/rpms/kmediafactory/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18560
Modified Files:
.cvsignore kmediafactory.spec sources
Added Files:
kmediafactory-0.8.1-gcc47.patch
Removed Files:
kmediafactory-0.8.0-docbook_fix.patch
Log Message:
sync w/devel
kmediafactory-0.8.1-gcc47.patch:
videoobject.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE kmediafactory-0.8.1-gcc47.patch ---
diff -up kmediafactory-0.8.1/plugins/video/videoobject.cpp.gcc47
kmediafactory-0.8.1/plugins/video/videoobject.cpp
--- kmediafactory-0.8.1/plugins/video/videoobject.cpp.gcc47 2011-08-01 02:47:08.000000000
-0500
+++ kmediafactory-0.8.1/plugins/video/videoobject.cpp 2012-05-04 07:47:07.166222072 -0500
@@ -597,15 +597,15 @@ QVariant VideoObject::writeDvdAuthorXml(
lang = "xx";
}
- QDomElement sub = doc.createElement("subpicture");
+ QDomElement sub2 = doc.createElement("subpicture");
if ((lang == preferredLanguage) && (subFound == false)) {
subFound = true;
subTrack = i;
}
- sub.setAttribute("lang", lang);
- titles.appendChild(sub);
+ sub2.setAttribute("lang", lang);
+ titles.appendChild(sub2);
++i;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/F-17/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Jun 2010 20:21:32 -0000 1.5
+++ .cvsignore 4 May 2012 12:50:31 -0000 1.6
@@ -1 +1 @@
-kmediafactory-0.8.0.tar.bz2
+kmediafactory-0.8.1.tar.bz2
Index: kmediafactory.spec
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/F-17/kmediafactory.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmediafactory.spec 2 Mar 2012 14:49:33 -0000 1.11
+++ kmediafactory.spec 4 May 2012 12:50:32 -0000 1.12
@@ -1,6 +1,6 @@
Name: kmediafactory
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: A template based DVD authoring tool
Group: User Interface/Desktops
@@ -13,7 +13,7 @@
Patch1: kmediafactory-0.8.0-mlt-melt.patch
## upstreamable patches
-Patch50: kmediafactory-0.8.0-docbook_fix.patch
+Patch50: kmediafactory-0.8.1-gcc47.patch
Patch51: kmediafactory-0.8.0-dso.patch
BuildRequires: kdelibs4-devel
@@ -65,7 +65,7 @@
%setup -q
%patch1 -p1 -b .mlt-melt
-%patch50 -p1
+%patch50 -p1 -b .gcc47
%patch51 -p1 -b .dso
@@ -120,11 +120,6 @@
update-mime-database %{_datadir}/mime &> /dev/null || :
gtk-update-icon-cache --quiet %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
%files -f kmediafactory-all.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS NEWS README TODO
@@ -142,6 +137,9 @@
%{_kde4_datadir}/applications/kde4/kmediafactory.desktop
%{_datadir}/mime/packages/kmediafactory.xml
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files libs -f libkmf.lang
%defattr(-,root,root,-)
%{_kde4_libdir}/libkmediafactoryinterfaces.so.0*
@@ -155,6 +153,9 @@
%changelog
+* Fri May 04 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.1-1
+- 0.8.1
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.0-3
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/F-17/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 14 Jun 2010 20:21:32 -0000 1.5
+++ sources 4 May 2012 12:50:32 -0000 1.6
@@ -1 +1 @@
-e3621dffd97a45acd6ff883181d6e106 kmediafactory-0.8.0.tar.bz2
+e13e4682c78d6f49647551aeab7a1235 kmediafactory-0.8.1.tar.bz2
--- kmediafactory-0.8.0-docbook_fix.patch DELETED ---