rpms/dvdstyler/F-8 .cvsignore, 1.2, 1.3 dvdstyler.spec, 1.1, 1.2 sources, 1.1, 1.2 dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch, 1.1, NONE dvdstyler-1.7.0-wxsvg-freeworld.patch, 1.1, NONE
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25071/F-8
Modified Files:
.cvsignore dvdstyler.spec sources
Removed Files:
dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch
dvdstyler-1.7.0-wxsvg-freeworld.patch
Log Message:
Update to 1.7.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Oct 2008 04:18:52 -0000 1.2
+++ .cvsignore 14 Nov 2008 04:50:38 -0000 1.3
@@ -1 +1 @@
-DVDStyler-1.7.0.tar.bz2
+DVDStyler-1.7.1.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-8/dvdstyler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvdstyler.spec 16 Oct 2008 04:18:52 -0000 1.1
+++ dvdstyler.spec 14 Nov 2008 04:50:38 -0000 1.2
@@ -1,6 +1,7 @@
Name: dvdstyler
-Version: 1.7.0
-Release: 3%{?dist}
+Epoch: 1
+Version: 1.7.1
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -8,8 +9,6 @@
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-1.6.2-desktop.patch
-Patch1: dvdstyler-1.7.0-wxsvg-freeworld.patch
-Patch2: dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
BuildRequires: gettext
@@ -17,7 +16,7 @@
BuildRequires: autoconf
# libraries
BuildRequires: wxGTK-devel >= 2.6.3
-BuildRequires: wxsvg-freeworld-devel
+BuildRequires: wxsvg-devel >= 1.0
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
# mpeg
@@ -40,7 +39,7 @@
Requires: dvdauthor
Requires: mkisofs
Requires: dvd+rw-tools
-
+Requires: wxsvg-freeworld >= 1.0
# Optional, defaults to off in burn settings in 1.5.1
Requires(hint): dvdisaster
@@ -54,12 +53,11 @@
%prep
%setup -q -n DVDStyler-%{version}
%patch0 -b .desktop
-%patch1 -b .wxsvg-freeworld
-%patch2 -b .ffmpeg-AVCodecTag
%build
-export CFLAGS="$CXXFLAGS -I/usr/include/wxSVG-freeworld
-L%{_libdir}/wxsvg-freeworld"
-export CXXFLAGS="$CXXFLAGS -I/usr/include/wxSVG-freeworld
-L%{_libdir}/wxsvg-freeworld"
+# some sed magic so we find wxsvg-freeworld properly
+%{__sed} -i 's|LIBS="$LIBS $WX_LIBS "|LIBS="$LIBS $WX_LIBS
-L%{_libdir}/wxsvg-freeworld "|g' configure.in
+%{__sed} -i 's|LDADD = ../wxVillaLib/libwxvilla.a|LDADD = ../wxVillaLib/libwxvilla.a
-L%{_libdir}/wxsvg-freeworld|g' src/Makefile.am
./autogen.sh
%configure \
--disable-dependency-tracking
@@ -111,6 +109,11 @@
%{_mandir}/*/*.gz
%changelog
+* Thu Nov 13 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.1-1
+- Update to 1.7.1
+- Remove AVCodecTag patch
+- Add wxsvg-freeworld to the linker paths
+
* Wed Oct 15 2008 Stewart Adam <s.adam at diffingo.com> - 1.7.0-3
- Add ffmpeg-devel and fix wxsvg-freeworld-devel BR
- Add patch to fix AVCodecTag conversion errors
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:49:42 -0000 1.1
+++ sources 14 Nov 2008 04:50:38 -0000 1.2
@@ -0,0 +1 @@
+9bbab1e83ad8e998f9eb008b4293b278 DVDStyler-1.7.1.tar.bz2
--- dvdstyler-1.7.0-ffmpeg-AVCodecTag.patch DELETED ---
--- dvdstyler-1.7.0-wxsvg-freeworld.patch DELETED ---