9:18 a.m.
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28809
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
reverting last commit
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-16/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 5 Nov 2012 08:13:01 -0000 1.11
+++ .cvsignore 5 Nov 2012 09:18:59 -0000 1.12
@@ -1 +1 @@
-DVDStyler-2.3.3.tar.bz2
+DVDStyler-2.0rc1.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-16/dvdstyler.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dvdstyler.spec 5 Nov 2012 08:13:01 -0000 1.16
+++ dvdstyler.spec 5 Nov 2012 09:18:59 -0000 1.17
@@ -1,15 +1,18 @@
Name: dvdstyler
Epoch: 1
-Version: 2.3.3
-Release: 1%{?dist}
+Version: 2.0
+Release: 0.1.rc1%{?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}.tar.bz2
+Source0:
http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}rc1.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
@@ -19,12 +22,11 @@
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0.10
BuildRequires: ffmpeg-devel
-BuildRequires: ffmpeg
BuildRequires: libgnomeui-devel
# mpeg
BuildRequires: dvdauthor
# iso/burn
-BuildRequires: pkgconfig(libudev)
+BuildRequires: libudev-devel
BuildRequires: mkisofs
BuildRequires: dvd+rw-tools
#images
@@ -41,7 +43,7 @@
Requires: mjpegtools
Requires: mkisofs
Requires: mpgtx
-Requires: wxsvg >= 1.1.9
+Requires: wxsvg >= 1.0.10
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -52,9 +54,10 @@
%prep
-%setup -q -n DVDStyler-%{version}
+%setup -q -n DVDStyler-%{version}rc1
%patch0 -b .validdesktop
%patch1 -b .libjpeg
+%patch2 -b .xmlto
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem
\\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -80,6 +83,10 @@
%find_lang %{name}
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
@@ -90,28 +97,6 @@
%{_mandir}/*/*.gz
%changelog
-* Sun Nov 04 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-1
-- New upstream release.
-
-* Sun Aug 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-1
-- Update upstream release
-
-* Tue Aug 07 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-0.1.rc1
-- Update upstream release
-- Drop patch2 and patch3, seems that was applied in upstream
-
-* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.5.rc1
-- Switch to pkgconfig(libudev)
-
-* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.4.rc1
-- Rebuilt for FFmpeg
-
-* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.3.rc1
-- Rebuilt for x264/FFmpeg
-
-* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.2.rc1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Wed Sep 28 2011 Stewart Adam <s.adam at diffingo.com> 1:2.0-0.1.rc1
- Update to 2.0rc1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-16/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 5 Nov 2012 08:13:01 -0000 1.12
+++ sources 5 Nov 2012 09:18:59 -0000 1.13
@@ -1 +1 @@
-73d897ab26a7fb3792bf1f9bd90e0225 DVDStyler-2.3.3.tar.bz2
+d6acd1a2c6ec591b794c632d532d5887 DVDStyler-2.0rc1.tar.bz2