rpms/subtitleeditor/devel subtitleeditor-0.30.0-sscanf.patch, NONE, 1.1 subtitleeditor.spec, 1.8, 1.9

[Martin Sourada]

Author: mso

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

Modified Files:
	subtitleeditor.spec 
Added Files:
	subtitleeditor-0.30.0-sscanf.patch 
Log Message:


Fix build in rawhide.



subtitleeditor-0.30.0-sscanf.patch:

--- NEW FILE subtitleeditor-0.30.0-sscanf.patch ---
diff -up subtitleeditor-0.30.0/plugins/subtitleformats/advancedsubstationalpha/advancedsubstationalpha.cc.sscanf subtitleeditor-0.30.0/plugins/subtitleformats/advancedsubstationalpha/advancedsubstationalpha.cc
--- subtitleeditor-0.30.0/plugins/subtitleformats/advancedsubstationalpha/advancedsubstationalpha.cc.sscanf	2008-11-22 11:11:24.000000000 +0100
+++ subtitleeditor-0.30.0/plugins/subtitleformats/advancedsubstationalpha/advancedsubstationalpha.cc	2009-02-23 19:43:38.000000000 +0100
@@ -402,7 +402,7 @@ public:
 	SubtitleTime from_ass_time(const Glib::ustring &t)
 	{
 		int h, m, s, ms;
-		if(std::sscanf(t.c_str(), "%d:%d:%d.%d", &h, &m, &s, &ms) == 4)
+		if(sscanf(t.c_str(), "%d:%d:%d.%d", &h, &m, &s, &ms) == 4)
 			return SubtitleTime(h, m, s, ms * 10);
 
 		return SubtitleTime::null();
diff -up subtitleeditor-0.30.0/plugins/subtitleformats/mpsub/mpsub.cc.sscanf subtitleeditor-0.30.0/plugins/subtitleformats/mpsub/mpsub.cc
--- subtitleeditor-0.30.0/plugins/subtitleformats/mpsub/mpsub.cc.sscanf	2008-11-22 11:11:24.000000000 +0100
+++ subtitleeditor-0.30.0/plugins/subtitleformats/mpsub/mpsub.cc	2009-02-23 19:50:11.000000000 +0100
@@ -92,7 +92,7 @@ public:
 					sub.set_end_frame((long)end_value);
 				}
 			}
-			else if(std::sscanf(line.c_str(), "FORMAT=%f", &framerate) == 1)
+			else if(sscanf(line.c_str(), "FORMAT=%f", &framerate) == 1)
 			{
 				// init to frame mode
 				document()->set_timing_mode(FRAME);
diff -up subtitleeditor-0.30.0/plugins/subtitleformats/substationalpha/substationalpha.cc.sscanf subtitleeditor-0.30.0/plugins/subtitleformats/substationalpha/substationalpha.cc
--- subtitleeditor-0.30.0/plugins/subtitleformats/substationalpha/substationalpha.cc.sscanf	2008-11-22 11:11:23.000000000 +0100
+++ subtitleeditor-0.30.0/plugins/subtitleformats/substationalpha/substationalpha.cc	2009-02-23 19:50:55.000000000 +0100
@@ -380,7 +380,7 @@ public:
 	SubtitleTime from_ssa_time(const Glib::ustring &t)
 	{
 		int h, m, s, ms;
-		if(std::sscanf(t.c_str(), "%d:%d:%d.%d", &h, &m, &s, &ms) == 4)
+		if(sscanf(t.c_str(), "%d:%d:%d.%d", &h, &m, &s, &ms) == 4)
 			return SubtitleTime(h, m, s, ms * 10);
 
 		return SubtitleTime::null();


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/extras/rpms/subtitleeditor/devel/subtitleeditor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- subtitleeditor.spec	11 Dec 2008 00:13:25 -0000	1.8
+++ subtitleeditor.spec	23 Feb 2009 19:23:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           subtitleeditor
 Version:        0.30.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
@@ -8,6 +8,7 @@
 URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/0.30/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-bug12649.patch
+Patch1:         %{name}-%{version}-sscanf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,7 +22,7 @@
 BuildRequires:  libxml++-devel
 BuildRequires:  intltool
 BuildRequires:  ccache
-BuildRequires:  libtool
+BuildRequires:  libtool autoconf automake
 
 # For spell checking (Optional)
 BuildRequires:  enchant-devel
@@ -42,8 +43,10 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1 -b .sscanf
 
 %build
+./autogen.sh
 %configure \
        --disable-debug \
        --disable-static \
@@ -99,6 +102,9 @@
 %{_libdir}/%{name}
 
 %changelog
+* Mon Feb 23 2009 Martin Sourada <mso at fedoraproject.org> - 0.30.0-4
+- Fix build on rawhide
+
 * Thu Dec 11 2008 Martin Sourada <mso at fedoraproject.org> - 0.30.0-3
 - Apply patch to upstream bug 12649 (lubek)
 - Various changes to spec file (lubek)