- fix format string error

- fix building with latest automake
- rel 10

diff --git a/am.patch b/am.patch
new file mode 100644 (file)
index 0000000..46e3cc9
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,82 @@
+diff -ur ogle-0.9.2.am/ac3/Makefile.am ogle-0.9.2/ac3/Makefile.am
+--- ogle-0.9.2.am/ac3/Makefile.am      2014-01-03 15:50:03.538454867 +0100
++++ ogle-0.9.2/ac3/Makefile.am 2014-01-03 15:51:51.758454081 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-pkglib_PROGRAMS = ogle_ac3_p ogle_audio
++pkglibexec_PROGRAMS = ogle_ac3_p ogle_audio
+ 
+ AM_CPPFLAGS = @TOP_INCLUDES@ @A52_CPPFLAGS@ @MAD_CPPFLAGS@ @XML_CPPFLAGS@
+ 
+diff -ur ogle-0.9.2.am/ctrl/Makefile.am ogle-0.9.2/ctrl/Makefile.am
+--- ogle-0.9.2.am/ctrl/Makefile.am     2014-01-03 15:50:19.845121415 +0100
++++ ogle-0.9.2/ctrl/Makefile.am        2003-10-14 03:05:15.000000000 +0200
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-pkglib_PROGRAMS = ogle_ctrl
++pkglibexec_PROGRAMS = ogle_ctrl
+ 
+ AM_CPPFLAGS = @TOP_INCLUDES@
+ AM_CFLAGS = @O_CFLAGS@
+diff -ur ogle-0.9.2.am/dvd_cli/Makefile.am ogle-0.9.2/dvd_cli/Makefile.am
+--- ogle-0.9.2.am/dvd_cli/Makefile.am  2014-01-03 15:50:50.865121189 +0100
++++ ogle-0.9.2/dvd_cli/Makefile.am     2014-01-03 15:51:51.798454081 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-pkglib_PROGRAMS = ogle_cli
++pkglibexec_PROGRAMS = ogle_cli
+ 
+ AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @XML_CPPFLAGS@
+ AM_CFLAGS = @O_CFLAGS@
+diff -ur ogle-0.9.2.am/mpeg2_program/Makefile.am ogle-0.9.2/mpeg2_program/Makefile.am
+--- ogle-0.9.2.am/mpeg2_program/Makefile.am    2014-01-03 15:50:32.255121324 +0100
++++ ogle-0.9.2/mpeg2_program/Makefile.am       2003-10-14 03:05:15.000000000 +0200
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-pkglib_PROGRAMS = ogle_mpeg_ps
++pkglibexec_PROGRAMS = ogle_mpeg_ps
+ 
+ AM_CPPFLAGS = @TOP_INCLUDES@ @DVDREAD_CPPFLAGS@
+ AM_CFLAGS = @O_CFLAGS@
+diff -ur ogle-0.9.2.am/mpeg2_video/Makefile.am ogle-0.9.2/mpeg2_video/Makefile.am
+--- ogle-0.9.2.am/mpeg2_video/Makefile.am      2014-01-03 15:51:04.255121093 +0100
++++ ogle-0.9.2/mpeg2_video/Makefile.am 2014-01-03 15:51:51.798454081 +0100
+@@ -45,7 +45,7 @@
+       c_mlib.c c_mlib.h \
+       ffb_asm.s ffb_asm.h
+ 
+-pkglib_PROGRAMS = ogle_mpeg_vs ogle_vout
++pkglibexec_PROGRAMS = ogle_mpeg_vs ogle_vout
+ 
+ AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @MLIB_CPPFLAGS@ @JPEG_CPPFLAGS@ @XML_CPPFLAGS@
+ AM_CFLAGS = @O_CFLAGS@
+diff -ur ogle-0.9.2.am/scripts/Makefile.am ogle-0.9.2/scripts/Makefile.am
+--- ogle-0.9.2.am/scripts/Makefile.am  2014-01-03 15:51:32.215120890 +0100
++++ ogle-0.9.2/scripts/Makefile.am     2003-05-22 21:10:38.000000000 +0200
+@@ -1,5 +1,5 @@
+ bin_SCRIPTS = ogle
+-dist_pkglib_SCRIPTS = ogle_audio_debug \
++dist_pkglibexec_SCRIPTS = ogle_audio_debug \
+               ogle_cli_debug \
+               ogle_ctrl_debug \
+               ogle_gui_debug \
+diff -ur ogle-0.9.2.am/vmg/Makefile.am ogle-0.9.2/vmg/Makefile.am
+--- ogle-0.9.2.am/vmg/Makefile.am      2014-01-03 15:51:16.281787672 +0100
++++ ogle-0.9.2/vmg/Makefile.am 2014-01-03 15:51:51.795120748 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-pkglib_PROGRAMS = ogle_nav
++pkglibexec_PROGRAMS = ogle_nav
+ bin_PROGRAMS = ifo_dump
+ noinst_PROGRAMS =  vmg_dump dump
+ 

diff --git a/format-security.patch b/format-security.patch
new file mode 100644 (file)
index 0000000..fc6f744
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- ogle-0.9.2/vmg/vmcmd.c~    2003-05-29 23:09:47.000000000 +0200
++++ ogle-0.9.2/vmg/vmcmd.c     2014-01-03 15:55:04.298452688 +0100
+@@ -134,7 +134,7 @@
+ 
+ static void print_system_reg(uint16_t reg) {
+   if(reg < sizeof(system_reg_abbr_table) / sizeof(char *))
+-    fprintf(stderr, system_reg_table[reg]);
++    fprintf(stderr, "%s", system_reg_table[reg]);
+   else
+     fprintf(stderr, " WARNING: Unknown system register ");
+ }

diff --git a/ogle.spec b/ogle.spec
index b5e03ef97436b7441bd9376d2f5d8e3ddb0d07bb..e6f390173ae8c975cf6f6f14dfad309b9df731ff 100644 (file)
--- a/ogle.spec
+++ b/ogle.spec
@@ -2,7 +2,7 @@ Summary:        DVD Player
 Summary(pl.UTF-8):     Program do odtwarzania filmów z DVD
 Name:          ogle
 Version:       0.9.2
-Release:       9
+Release:       10
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz
@@ -10,6 +10,8 @@ Source0:      http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz
 Patch0:                %{name}-cvs-20070625.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libdvdread4.patch
+Patch3:                am.patch
+Patch4:                format-security.patch
 URL:           http://www.dtek.chalmers.se/~dvd/
 BuildRequires: a52dec-libs-devel >= 0.7.3
 BuildRequires: autoconf
@@ -65,6 +67,8 @@ Statyczne biblioteki libaviplay.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}