Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10725
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 28 Sep 2011 22:39:16 -0000 1.10
+++ .cvsignore 26 Aug 2012 14:40:03 -0000 1.11
@@ -1 +1 @@
-DVDStyler-2.0rc1.tar.bz2
+DVDStyler-2.3.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dvdstyler.spec 11 Jul 2012 20:52:12 -0000 1.20
+++ dvdstyler.spec 26 Aug 2012 14:40:03 -0000 1.21
@@ -1,19 +1,15 @@
Name: dvdstyler
Epoch: 1
-Version: 2.0
-Release: 0.5.rc1%{?dist}
+Version: 2.3
+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}rc1.tar.bz2
+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
-Patch3: dvdstyler-ffmpeg54.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
BuildRequires: automake, autoconf
@@ -23,6 +19,7 @@
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0.10
BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg
BuildRequires: libgnomeui-devel
# mpeg
BuildRequires: dvdauthor
@@ -44,7 +41,7 @@
Requires: mjpegtools
Requires: mkisofs
Requires: mpgtx
-Requires: wxsvg >= 1.0.10
+Requires: wxsvg >= 1.1.9
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -55,11 +52,9 @@
%prep
-%setup -q -n DVDStyler-%{version}rc1
+%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
%patch1 -b .libjpeg
-%patch2 -b .xmlto
-%patch3 -p1 -b .ffmpeg54
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem
\\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -85,10 +80,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
@@ -99,6 +90,13 @@
%{_mandir}/*/*.gz
%changelog
+* 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)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 28 Sep 2011 22:39:16 -0000 1.11
+++ sources 26 Aug 2012 14:40:03 -0000 1.12
@@ -1 +1 @@
-d6acd1a2c6ec591b794c632d532d5887 DVDStyler-2.0rc1.tar.bz2
+0f1b4e8e3e6acc24e73634160e727f20 DVDStyler-2.3.tar.bz2