Author: firewing Update of /cvs/free/rpms/dvdstyler/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6258 Modified Files: .cvsignore dvdstyler.spec sources Added Files: dvdstyler-wxVillaLib-libjpeg.patch Removed Files: dvdstyler-1.7.4-autoconf.patch Log Message: * Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1 - Update to 1.8.1 - Merge change from F-13: Remove some of the outdated Requires and BuildRequires dvdstyler-wxVillaLib-libjpeg.patch: Makefile.am | 1 + 1 file changed, 1 insertion(+) --- NEW FILE dvdstyler-wxVillaLib-libjpeg.patch --- --- src/Makefile.am.orig 2010-05-03 02:06:41.000000000 -0400 +++ src/Makefile.am 2010-11-20 18:07:52.380692993 -0500 @@ -9,6 +9,7 @@ AM_CXXFLAGS = @CXXFLAGS@ -I.. LDADD = ../wxVillaLib/libwxvilla.a +AM_LDFLAGS = @LDFLAGS@ -ljpeg EXTRA_DIST = dvdvml.l dvdvmy.y MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-14/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Oct 2009 04:53:15 -0000 1.7 +++ .cvsignore 20 Nov 2010 23:28:24 -0000 1.8 @@ -1 +1 @@ -DVDStyler-1.7.4.tar.bz2 +DVDStyler-1.8.1.tar.bz2 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-14/dvdstyler.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dvdstyler.spec 24 Oct 2009 04:53:15 -0000 1.11 +++ dvdstyler.spec 20 Nov 2010 23:28:24 -0000 1.12 @@ -1,6 +1,6 @@ Name: dvdstyler Epoch: 1 -Version: 1.7.4 +Version: 1.8.1 Release: 1%{?dist} Summary: Cross-platform DVD authoring application @@ -9,21 +9,18 @@ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 Patch0: dvdstyler-make-desktopfile-valid.patch -# Patch from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/dv... -# Fixes translation compile issue -Patch1: dvdstyler-1.7.4-autoconf.patch +Patch1: dvdstyler-wxVillaLib-libjpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build -BuildRequires: automake, autoconf, gettext +BuildRequires: automake, autoconf +BuildRequires: gettext +BuildRequires: byacc # libraries BuildRequires: wxGTK-devel >= 2.6.3 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 @@ -31,17 +28,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 @@ -55,11 +52,11 @@ %prep %setup -q -n DVDStyler-%{version} %patch0 -b .validdesktop -%patch1 -p0 -b .autoconf +%patch1 -b .libjpeg %{__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 @@ -95,6 +92,10 @@ %{_mandir}/*/*.gz %changelog +* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1 +- Update to 1.8.1 +- Merge change from F-13: 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/F-14/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Oct 2009 04:53:15 -0000 1.8 +++ sources 20 Nov 2010 23:28:24 -0000 1.9 @@ -1 +1 @@ -874972691bd342caf6b1415625816d1d DVDStyler-1.7.4.tar.bz2 +076bd95e15912c1c0f7f9165d0ea5632 DVDStyler-1.8.1.tar.bz2 --- dvdstyler-1.7.4-autoconf.patch DELETED ---