7:40 a.m.
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6311
Modified Files:
.cvsignore dvdstyler.spec sources
Added Files:
dvdstyler-docs-xmlto.patch
Removed Files:
dvdstyler-1.7.4-autoconf.patch
Log Message:
* Tue Oct 25 2011 Stewart Adam <s.adam at diffingo.com> 1:2.0-1
- Update to 2.0
dvdstyler-docs-xmlto.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE dvdstyler-docs-xmlto.patch ---
--- docs/Makefile.am.orig
+++ docs/Makefile.am
@@ -6,7 +6,7 @@
help_%.zip: DVDStylerGuide_%.xml
t=`mktemp -d tempXXXXXXX`; \
- (cd "$$t" && $(XMLTO) --skip-validation htmlhelp
../DVDStylerGuide_$*.xml && rm -f *.hh* && $(ZIP) ../help_$*.zip *.html);
\
+ (cd "$$t" && $(XMLTO) --skip-validation htmlhelp
../DVDStylerGuide_$*.xml && rm -f *.hh* *.proc && $(ZIP) ../help_$*.zip
*.html); \
rm -f "$$t"/*.html; \
if [ -d "images/$*" ]; then \
$(ZIP) help_$*.zip htmlhelp.hhp toc.hhc images/$*/*.png images/$*/*.jpg; \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-15/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 2 May 2011 07:20:36 -0000 1.8
+++ .cvsignore 25 Oct 2011 07:40:22 -0000 1.9
@@ -1 +1 @@
-DVDStyler-1.8.3.tar.bz2
+DVDStyler-2.0.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-15/dvdstyler.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvdstyler.spec 2 May 2011 07:20:36 -0000 1.12
+++ dvdstyler.spec 25 Oct 2011 07:40:23 -0000 1.13
@@ -1,6 +1,6 @@
Name: dvdstyler
Epoch: 1
-Version: 1.8.3
+Version: 2.0
Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
@@ -10,6 +10,9 @@
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
Patch1: dvdstyler-wxVillaLib-libjpeg.patch
+# Based on
http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/dvdstyler/files/pa...
+# Fixes 'directory not empty' error because of xmlto outputting a new .proc file
+Patch2: dvdstyler-docs-xmlto.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
BuildRequires: automake, autoconf
@@ -17,7 +20,7 @@
BuildRequires: byacc
# libraries
BuildRequires: wxGTK-devel >= 2.6.3
-BuildRequires: wxsvg-devel >= 1.0-6
+BuildRequires: wxsvg-devel >= 1.0.10
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
# mpeg
@@ -40,7 +43,7 @@
Requires: mjpegtools
Requires: mkisofs
Requires: mpgtx
-Requires: wxsvg >= 1.0-6
+Requires: wxsvg >= 1.0.10
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -54,6 +57,7 @@
%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
%patch1 -b .libjpeg
+%patch2 -b .xmlto
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem
\\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -93,6 +97,12 @@
%{_mandir}/*/*.gz
%changelog
+* Tue Oct 25 2011 Stewart Adam <s.adam at diffingo.com> 1:2.0-1
+- Update to 2.0
+
+* Wed Sep 28 2011 Stewart Adam <s.adam at diffingo.com> 1:1.8.4.3-1
+- Update to 1.8.4.3
+
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> - 1:1.8.3-1
- Update to 1.8.3
- Port changes from F-14 branch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 2 May 2011 07:20:36 -0000 1.9
+++ sources 25 Oct 2011 07:40:24 -0000 1.10
@@ -1 +1 @@
-69a6d0a920e780bbcf65e94041e58429 DVDStyler-1.8.3.tar.bz2
+b87ebb6a0d0e530ccc9d8abc353f242d DVDStyler-2.0.tar.bz2
--- dvdstyler-1.7.4-autoconf.patch DELETED ---