Author: firewing Update of /cvs/free/rpms/dvdstyler/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15282 Modified Files: .cvsignore dvdstyler.spec sources Added Files: dvdstyler-1.7.4-autoconf.patch Log Message: * Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.4-1 - Update to 1.7.4 dvdstyler-1.7.4-autoconf.patch: --- NEW FILE dvdstyler-1.7.4-autoconf.patch --- --- /tmp/DVDStyler-1.7.4/./src/Makefile.am 2009-09-04 15:49:32.000000000 +1000 +++ ./src/Makefile.am 2009-10-14 15:34:46.000000000 +1100 @@ -7,7 +7,7 @@ VobListBox.cpp TitlePropDlg.cpp TitlesetManager.cpp\ BurnDlg.cpp ProgressDlg.cpp DirCtrl.cpp StatusBar.cpp MainWin.cpp dvdstyler.cpp -CXXFLAGS = @CXXFLAGS@ -I.. +AM_CXXFLAGS = @CXXFLAGS@ -I.. LDADD = ../wxVillaLib/libwxvilla.a SUBDIRS = rc --- /tmp/DVDStyler-1.7.4/./Makefile.am 2008-07-15 07:58:46.000000000 +1000 +++ ./Makefile.am 2009-10-14 15:23:26.000000000 +1100 @@ -1,6 +1,5 @@ SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs ACLOCAL_AMFLAGS=-I. -pkgdatadir=@datadir@/doc/@PACKAGE@ -pkgdata_DATA = AUTHORS COPYING INSTALL README ChangeLog +doc_DATA = AUTHORS COPYING INSTALL README ChangeLog run: all $(MAKE) -C src run --- /tmp/DVDStyler-1.7.4/./wxVillaLib/Makefile.am 2007-12-31 09:51:35.000000000 +1100 +++ ./wxVillaLib/Makefile.am 2009-10-14 15:35:32.000000000 +1100 @@ -3,4 +3,4 @@ PipeExecute.cpp PropDlg.cpp SConv.cpp\ Thumbnails.cpp ThumbnailFactory.cpp\ utils.cpp VerticalToolbar.cpp -CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG +AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG --- /tmp/DVDStyler-1.7.4/locale/Makefile.in 2009-09-19 18:46:38.000000000 +1000 +++ locale/Makefile.in 2009-10-14 15:46:49.000000000 +1100 @@ -4,8 +4,10 @@ # building lang.mo files from the translated lang.po catalogs. PROGNAME=dvdstyler -LINGUAS=cs da de el es eu fr hu it ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW -LINGUAS_ALL=ca cs da de el es eu fr hu it ja ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW +# ls *.po | cut -f1 -d . | xargs echo >> Makefile.in +LINGUAS=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW +LINGUAS_ALL=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW + prefix=@prefix@ datarootdir=@datarootdir@ --- /tmp/DVDStyler-1.7.4/docs/Makefile.am 2009-08-30 00:30:10.000000000 +1000 +++ docs/Makefile.am 2009-10-14 16:08:10.000000000 +1100 @@ -1,22 +1,19 @@ -pkgdatadir=@datadir@/man/man1 -pkgdata_DATA = dvdstyler.1 +dist_man_MANS = dvdstyler.1 LINGUAS=en de -docdir=@datadir@/@PACKAGE@/docs doc_DATA = $(LINGUAS:%=help_%.zip) help%.zip: DVDStylerGuide%.xml - mkdir temp - (cd temp && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html) - rm -f temp/*.html - rmdir temp + t=`mktemp -d tempXXXXXXX`; \ + (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html) ; \ + rm -f "$$t"/*.html ; \ + rmdir "$$t" $(ZIP) help$*.zip htmlhelp.hhp toc.hhc images/*.png html: $(LINGUAS:%=html_%) html%: DVDStylerGuide%.xml - rm -rf html$* - mkdir html$* - (cd html$* && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*) - mkdir html$*/images + t=`mktemp -d htmlXXXXXX` ; \ + (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*) ; \ + mkdir "$$t"/images cp images/*.png html$*/images/ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jun 2009 19:51:04 -0000 1.6 +++ .cvsignore 24 Oct 2009 04:53:15 -0000 1.7 @@ -1 +1 @@ -DVDStyler-1.7.3b3_1.tar.bz2 +DVDStyler-1.7.4.tar.bz2 Index: dvdstyler.spec =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dvdstyler.spec 21 Oct 2009 13:29:05 -0000 1.10 +++ dvdstyler.spec 24 Oct 2009 04:53:15 -0000 1.11 @@ -1,14 +1,17 @@ Name: dvdstyler Epoch: 1 -Version: 1.7.3 -Release: 0.2.beta3%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Cross-platform DVD authoring application Group: Applications/Multimedia License: GPLv2+ URL: http://www.dvdstyler.de/ -Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}b3_1.tar.bz2 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # build BuildRequires: automake, autoconf, gettext @@ -50,14 +53,17 @@ %prep -%setup -q -n DVDStyler-%{version}b3_1 +%setup -q -n DVDStyler-%{version} %patch0 -b .validdesktop +%patch1 -p0 -b .autoconf %{__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 +make -C docs make %{?_smp_mflags} @@ -89,6 +95,9 @@ %{_mandir}/*/*.gz %changelog +* Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.4-1 +- Update to 1.7.4 + * Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:1.7.3-0.2.beta3 - rebuild for new ffmpeg Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jun 2009 19:51:05 -0000 1.7 +++ sources 24 Oct 2009 04:53:15 -0000 1.8 @@ -1 +1 @@ -1169a01857ba35e1aac62dae9975ca35 DVDStyler-1.7.3b3_1.tar.bz2 +874972691bd342caf6b1415625816d1d DVDStyler-1.7.4.tar.bz2