rpms/dvdstyler/devel .cvsignore, 1.14, 1.15 dvdstyler.spec, 1.27, 1.28 sources, 1.16, 1.17 dvdstyler-wxVillaLib-libjpeg.patch, 1.1, NONE

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16053

Modified Files:
	.cvsignore dvdstyler.spec sources 
Removed Files:
	dvdstyler-wxVillaLib-libjpeg.patch 
Log Message:
* Wed Jan 23 2013 Sérgio Basto <sergio at serjux.com> - 2.4-0.1.rc1
- Update to 2.4rc1, to fix rfbz #2652 and rebuild for new wxSVG.
- drop dvdstyler-wxVillaLib-libjpeg.patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Dec 2012 05:54:10 -0000	1.14
+++ .cvsignore	23 Jan 2013 07:13:36 -0000	1.15
@@ -1 +1 @@
-DVDStyler-2.3.5.tar.bz2
+DVDStyler-2.4rc1.tar.bz2


Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dvdstyler.spec	26 Dec 2012 19:08:40 -0000	1.27
+++ dvdstyler.spec	23 Jan 2013 07:13:36 -0000	1.28
@@ -1,22 +1,23 @@
+%global prerel rc1
+
 Name:           dvdstyler
 Epoch:          1
-Version:        2.3.5
-Release:        2%{?dist}
+Version:        2.4
+Release:        0.1%{?prerel}%{?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}%{?prerel}.tar.bz2
 Patch0:         dvdstyler-make-desktopfile-valid.patch
-Patch1:         dvdstyler-wxVillaLib-libjpeg.patch
 # build
 BuildRequires:  automake, autoconf
 BuildRequires:  gettext
 BuildRequires:  byacc
 # libraries
 BuildRequires:  wxGTK-devel >= 2.6.3
-BuildRequires:  wxsvg-devel >= 1.0.10
+BuildRequires:  wxsvg-devel >= 1.1.12
 BuildRequires:  ffmpeg-devel
 BuildRequires:  ffmpeg
 BuildRequires:  libgnomeui-devel
@@ -40,7 +41,7 @@
 Requires:       mjpegtools
 Requires:       mkisofs
 Requires:       mpgtx
-Requires:       wxsvg >= 1.1.9
+Requires:       wxsvg >= 1.1.12
 # note: do not add Require: totem-backend or another DVD player - see
 # RPM Fusion bug 366 for more details
 
@@ -51,9 +52,8 @@
 
 
 %prep
-%setup -q -n DVDStyler-%{version}
+%setup -q -n DVDStyler-%{version}%{?prerel}
 %patch0 -b .validdesktop
-%patch1 -b .libjpeg
 
 %{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
 
@@ -89,6 +89,10 @@
 %{_mandir}/*/*.gz
 
 %changelog
+* Wed Jan 23 2013 Sérgio Basto <sergio at serjux.com> - 2.4-0.1.rc1
+- Update to 2.4rc1, to fix rfbz #2652 and rebuild for new wxSVG.
+- drop dvdstyler-wxVillaLib-libjpeg.patch, fixed upstream.
+
 * Wed Dec 26 2012 Sérgio Basto <sergio at serjux.com> - 2.3.5-2
 - New upstream source, which have guide_pt and guide_ro.
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	26 Dec 2012 19:08:10 -0000	1.16
+++ sources	23 Jan 2013 07:13:36 -0000	1.17
@@ -1 +1 @@
-946009867f43b47db22eba9e5230e412  DVDStyler-2.3.5.tar.bz2
+0ea0127213768400789014c62317cdec  DVDStyler-2.4rc1.tar.bz2


--- dvdstyler-wxVillaLib-libjpeg.patch DELETED ---