commit cf2ff0bd4db7ec16aa151fc733a60b8cc0ea2811
Author: Jacek Konieczny <jaj...@jajcus.net>
Date: Tue Oct 9 20:10:13 2012 +0200
Version: 0.40.0
subtitleeditor-glib_include.patch | 12 ++++++++++++
subtitleeditor.spec | 15 ++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index c27155e..9805cb7 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -4,12 +4,13 @@
Summary: GTK+ tool to edit subtitles
Summary(pl.UTF-8): Narzędzie napisane w GTK+ do edycji napisów
Name: subtitleeditor
-Version: 0.39.0
-Release: 0.1
+Version: 0.40.0
+Release: 1
License: GPL v3+
Group: X11/Applications
-Source0:
http://download.gna.org/subtitleeditor/0.39/%{name}-%{version}.tar.gz
-# Source0-md5: 17666e652edd27abfd3104a82385f6a8
+Source0:
http://download.gna.org/subtitleeditor/0.40/%{name}-%{version}.tar.gz
+# Source0-md5: cb8a5dec7eeea8357ad5a9e977e5d5bd
+Patch0: %{name}-glib_include.patch
URL: http://home.gna.org/subtitleeditor/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -50,6 +51,7 @@ Subtitle Editor jest narzędziem napisanym w GTK+ do edycji
napisów.
%prep
%setup -q
+%patch0 -p1
%build
%{__intltoolize}
@@ -59,8 +61,6 @@ Subtitle Editor jest narzędziem napisanym w GTK+ do edycji
napisów.
%{__autoheader}
%{__automake}
%configure
-#%%configure \
-# --enable-gl
%{__make}
@@ -144,10 +144,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libadobeencoredvdpal.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libadvancedsubstationalpha.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libbitc.so
+%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libdcsubtitle.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libmicrodvd.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libmpl2.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libmpsub.so
-%attr(755,root,root)
%{_libdir}/subtitleeditor/plugins/subtitleformats/libsami.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libsami.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libsbv.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libsprucestl.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libsubrip.so
diff --git a/subtitleeditor-glib_include.patch
b/subtitleeditor-glib_include.patch
new file mode 100644
index 0000000..48aac9c
--- /dev/null
+++ b/subtitleeditor-glib_include.patch
@@ -0,0 +1,12 @@
+diff -dur -x '*~'
subtitleeditor-0.40.0.orig/plugins/actions/findandreplace/findandreplace.cc
subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc
+---
subtitleeditor-0.40.0.orig/plugins/actions/findandreplace/findandreplace.cc
2012-02-22 20:02:05.000000000 +0100
++++ subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc
2012-10-09 18:49:54.216977964 +0200
+@@ -26,7 +26,7 @@
+ #include <gui/dialogutility.h>
+ #include <gtkmm_utility.h>
+ #include <widget_config_utility.h>
+-#include <glib/gregex.h>
++#include <glib.h>
+
+ /*
+ * FIXME:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subtitleeditor.git/commitdiff/cf2ff0bd4db7ec16aa151fc733a60b8cc0ea2811
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
