diff --git a/libvisual-0.4.0-format-security.patch b/libvisual-0.4.0-format-security.patch new file mode 100644 index 0000000..ab1e4d6 --- /dev/null +++ b/libvisual-0.4.0-format-security.patch @@ -0,0 +1,17 @@ +diff -up libvisual-0.4.0/libvisual/lv_plugin.c.format-security libvisual-0.4.0/libvisual/lv_plugin.c +--- libvisual-0.4.0/libvisual/lv_plugin.c.format-security 2014-06-11 15:38:36.786199952 -0400 ++++ libvisual-0.4.0/libvisual/lv_plugin.c 2014-06-11 15:38:45.990132144 -0400 +@@ -442,11 +442,11 @@ VisList *visual_plugin_registry_filter ( + + visual_list_add (list, ref); + } else if (ret != FALSE) { +- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret)); ++ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret)); + } + } + else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */ +- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret)); ++ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret)); + } + } + diff --git a/libvisual.spec b/libvisual.spec index 5d34bae..32bc1d2 100644 --- a/libvisual.spec +++ b/libvisual.spec @@ -1,23 +1,19 @@ -%define smallversion 0.5 -%global commit 7e4bc9ab9b54f94b399e193e5850276bfc2f55a5 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%define smallversion 0.4 Name: libvisual -Version: 0.5.0 -Release: 0.2.git%{shortcommit}%{?dist} +Version: 0.4.0 +Release: 15%{?dist} +Epoch: 1 Summary: Abstraction library for audio visualisation plugins - Group: Applications/Multimedia License: LGPLv2+ -URL: http://github.com/Libvisual/libvisual -Source0: https://github.com/Libvisual/libvisual/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xorg-x11-proto-devel, orc-devel, cmake, zlib-devel -BuildRequires: libpng-devel, mesa-libGL-devel, git, gettext, SDL-devel - +URL: http://libvisual.sf.net +Source0: http://dl.sf.net/libvisual/libvisual-%{version}.tar.gz +BuildRequires: xorg-x11-proto-devel # https://bugzilla.redhat.com/show_bug.cgi?id=435771 -Patch0: libvisual-0.5.0-better-altivec-detection.patch - +Patch0: libvisual-0.4.0-better-altivec-detection.patch +Patch1: libvisual-0.4.0-inlinedefineconflict.patch +Patch2: libvisual-0.4.0-format-security.patch %description Libvisual is an abstraction library that comes between applications and @@ -44,47 +40,45 @@ audio visualisation plugins. This package contains the files needed to build an application with libvisual. %prep -%setup -qn %{name}-%{commit} -pushd libvisual +%setup -q %patch0 -p1 -b .altivec-detection -popd +%patch1 -p1 -b .inlinedefineconflict +%patch2 -p1 -b .format-security %build -pushd libvisual -%cmake -DOPT_C_FLAGS="%{optflags}" - -make %{?_smp_mflags} -# CXX_FLAGS+="%{optflags}" - -popd +%ifarch i386 +export CFLAGS="${RPM_OPT_FLAGS} -mmmx" +%endif +%configure +make %{?_smp_mflags} %install -pushd libvisual make install DESTDIR=%{buildroot} - find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' -popd + +%find_lang %{name}-%{smallversion} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -%doc libvisual/AUTHORS libvisual/COPYING libvisual/ChangeLog libvisual/NEWS libvisual/README libvisual/TODO -%{_bindir}/lv-tool +%files -f %{name}-%{smallversion}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/*.so.* %files devel +%defattr(-,root,root,-) +%doc README NEWS TODO AUTHORS %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/%{name}-%{smallversion} -%changelog -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.0-0.2.git7e4bc9a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Tue Dec 03 2013 Tom Callaway - 0.5.0-0.1.git7e4bc9a -- Update to 0.5.0 (git) +%changelog +* Wed Jun 11 2014 Tom Callaway - 1:0.4.0-15 +- 0.5.0 beta was a bad idea. nothing else supports it. +- fix format-security issue * Sat Aug 03 2013 Fedora Release Engineering - 0.4.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index db5e858..9d800c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e1829eb40b0e1d18db4bb4de5a4a0e8 libvisual-0.5.0-7e4bc9a.tar.gz +f4e78547c79ea8a8ad111cf8b85011bb libvisual-0.4.0.tar.gz