[gnome-subtitles] - Fixed security vulnrerability CVE-2010-3357 - Updated scriptlets to the latest spec - Dropped scro
belegdol
belegdol at fedoraproject.org
Thu Sep 30 20:24:37 UTC 2010
commit 4c2dc8936134c960df7f2639e37d22f303aa1fc1
Author: Julian Sikorski <belegdol at gmail.com>
Date: Thu Sep 30 22:24:38 2010 +0200
- Fixed security vulnrerability CVE-2010-3357
- Updated scriptlets to the latest spec
- Dropped scrollkeeper BR
gnome-subtitles-ldlibpath.patch | 16 ++++++++++++++++
gnome-subtitles.spec | 34 +++++++++++-----------------------
2 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/gnome-subtitles-ldlibpath.patch b/gnome-subtitles-ldlibpath.patch
new file mode 100644
index 0000000..7cc6da2
--- /dev/null
+++ b/gnome-subtitles-ldlibpath.patch
@@ -0,0 +1,16 @@
+diff -up gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in.ldlibpath gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in
+--- gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in.ldlibpath 2009-09-09 00:16:36.000000000 +0200
++++ gnome-subtitles-1.0/src/GnomeSubtitles/Execution/gnome-subtitles.in 2010-09-30 22:21:54.000000000 +0200
+@@ -6,7 +6,11 @@ libdir=@libdir@
+
+ sublibdir=@SUBLIB_DLL_DIR@
+
+-export LD_LIBRARY_PATH="$libdir/gnome-subtitles:$LD_LIBRARY_PATH"
++if [ -z ${LD_LIBRARY_PATH} ]; then
++ export LD_LIBRARY_PATH=$libdir/gnome-subtitles
++else
++ export LD_LIBRARY_PATH=$libdir/gnome-subtitles:${LD_LIBRARY_PATH}
++fi
+ export MONO_PATH=$sublibdir:$MONO_PATH
+ exec -a gnome-subtitles @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@"
+
diff --git a/gnome-subtitles.spec b/gnome-subtitles.spec
index a47315b..d465611 100644
--- a/gnome-subtitles.spec
+++ b/gnome-subtitles.spec
@@ -1,6 +1,6 @@
Name: gnome-subtitles
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Subtitle editor for Gnome
Group: Applications/Multimedia
@@ -8,6 +8,7 @@ Group: Applications/Multimedia
License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+)
URL: http://gnome-subtitles.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: %{name}-ldlibpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -20,7 +21,6 @@ BuildRequires: gtk-sharp2-devel
BuildRequires: intltool
BuildRequires: mono-devel
BuildRequires: perl(XML::Parser)
-BuildRequires: scrollkeeper
Requires: mono-locale-extras
@@ -28,9 +28,6 @@ Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-
# No mono available here.
ExcludeArch: sparc64
@@ -45,6 +42,7 @@ translation and synchronization.
%prep
%setup -q
+%patch0 -p1 -b .ldlibpath
%build
@@ -67,34 +65,19 @@ desktop-file-install --vendor=fedora \
%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas >/dev/null || :
- # If the schema file has ever been renamed::
- #gconftool-2 --makefile-uninstall-rule \
- # %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
+%gconf_schema_prepare %{name}.schemas
%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || :
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+%gconf_schema_upgrade %{name}.schemas
update-desktop-database &> /dev/null || :
%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || :
-fi
+%gconf_schema_remove %{name}.schemas
%postun
-scrollkeeper-update -q || :
update-desktop-database &> /dev/null || :
@@ -113,6 +96,11 @@ update-desktop-database &> /dev/null || :
%changelog
+* Thu Sep 30 2010 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-2
+- Fixed security vulnrerability CVE-2010-3357
+- Updated scriptlets to the latest spec
+- Dropped scrollkeeper BR
+
* Sat Feb 20 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 1.0-1
- Updated to 1.0
More information about the scm-commits
mailing list