rpms/dvdstyler/F-13 dvdstyler-1.8-libjpeg.patch, NONE, 1.1 dvdstyler-1.8-template-subdir.patch, NONE, 1.1 dvdstyler.spec, 1.12, 1.13

[Stewart Adam]

Author: firewing

Update of /cvs/free/rpms/dvdstyler/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1661

Modified Files:
	dvdstyler.spec 
Added Files:
	dvdstyler-1.8-libjpeg.patch 
	dvdstyler-1.8-template-subdir.patch 
Log Message:
* Wed May 19 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.0.3-1
- Update to 1.8.0.3
- Remove some of the outdated Requires and BuildRequires


dvdstyler-1.8-libjpeg.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dvdstyler-1.8-libjpeg.patch ---
--- configure.in.old	2009-11-22 08:02:27.000000000 -0500
+++ configure.in	2010-05-29 00:21:19.333340837 -0400
@@ -90,7 +90,7 @@
 dnl check path for old ffmpeg
 AC_CHECK_HEADERS([ffmpeg/avutil.h])
 CXXFLAGS="$CXXFLAGS $FFMPEG_CFLAGS"
-LIBS="$LIBS $FFMPEG_LIBS"
+LIBS="$LIBS $FFMPEG_LIBS -ljpeg"
 
 CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir/$PACKAGE\\\""
 

dvdstyler-1.8-template-subdir.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dvdstyler-1.8-template-subdir.patch ---
--- Makefile.am.old	2010-05-29 15:23:15.339439319 -0400
+++ Makefile.am	2010-05-29 15:23:20.697439611 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs
+SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs templates
 ACLOCAL_AMFLAGS=-I.
 doc_DATA = AUTHORS COPYING INSTALL README ChangeLog
 run: all


Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/dvdstyler.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvdstyler.spec	19 May 2010 19:47:28 -0000	1.12
+++ dvdstyler.spec	29 May 2010 19:58:26 -0000	1.13
@@ -9,6 +9,8 @@
 URL:            http://www.dvdstyler.de/
 Source0:        http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
 Patch0:         dvdstyler-make-desktopfile-valid.patch
+Patch1:         dvdstyler-1.8-libjpeg.patch
+Patch2:         dvdstyler-1.8-template-subdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # build
 BuildRequires:  automake, autoconf, gettext
@@ -17,10 +19,7 @@
 BuildRequires:  wxsvg-devel >= 1.0-6
 BuildRequires:  ffmpeg-devel
 BuildRequires:  libgnomeui-devel
-BuildRequires:  zip
 # mpeg
-BuildRequires:  mpgtx
-BuildRequires:  mjpegtools
 BuildRequires:  dvdauthor
 # iso/burn
 BuildRequires:  mkisofs
@@ -28,17 +27,17 @@
 #images
 BuildRequires:  libjpeg-devel
 BuildRequires:  libexif-devel
-BuildRequires:  netpbm-progs
-# finally
-BuildRequires:  desktop-file-utils
+# documentation
+BuildRequires:  zip
 BuildRequires:  xmlto
 
+BuildRequires:  desktop-file-utils
+
 Requires:       dvd+rw-tools
 Requires:       dvdauthor
 Requires:       mjpegtools
 Requires:       mkisofs
 Requires:       mpgtx
-Requires:       netpbm-progs
 Requires:       wxsvg >= 1.0-6
 # note: do not add Require: totem-backend or another DVD player - see
 # RPM Fusion bug 366 for more details
@@ -51,11 +50,13 @@
 
 %prep
 %setup -q -n DVDStyler-%{version}
-%patch0 -b .validdesktop
+%patch0 -b .nonvalid
+%patch1 -b .libjpeg
+%patch2 -b .templates
 %{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
 
 %build
-#./autogen.sh
+./autogen.sh
 %configure \
   --disable-dependency-tracking
 # docs folder is not smp_mflags safe
@@ -93,6 +94,7 @@
 %changelog
 * Wed May 19 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.0.3-1
 - Update to 1.8.0.3
+- Remove some of the outdated Requires and BuildRequires
 
 * Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.4-1
 - Update to 1.7.4