rpms/dvdstyler/F-13 dvdstyler-wxVillaLib-libjpeg.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 dvdstyler.spec, 1.14, 1.15 sources, 1.9, 1.10 dvdstyler-1.8-libjpeg.patch, 1.1, NONE dvdstyler-1.8-template-subdir.patch, 1.1, NONE
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6152
Modified Files:
.cvsignore dvdstyler.spec sources
Added Files:
dvdstyler-wxVillaLib-libjpeg.patch
Removed Files:
dvdstyler-1.8-libjpeg.patch
dvdstyler-1.8-template-subdir.patch
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
- Update to 1.8.1
dvdstyler-wxVillaLib-libjpeg.patch:
Makefile.am | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE dvdstyler-wxVillaLib-libjpeg.patch ---
--- src/Makefile.am.orig 2010-05-03 02:06:41.000000000 -0400
+++ src/Makefile.am 2010-11-20 18:07:52.380692993 -0500
@@ -9,6 +9,7 @@
AM_CXXFLAGS = @CXXFLAGS@ -I..
LDADD = ../wxVillaLib/libwxvilla.a
+AM_LDFLAGS = @LDFLAGS@ -ljpeg
EXTRA_DIST = dvdvml.l dvdvmy.y
MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 19 May 2010 19:47:28 -0000 1.8
+++ .cvsignore 20 Nov 2010 23:28:12 -0000 1.9
@@ -1 +1 @@
-DVDStyler-1.8.0.3.tar.bz2
+DVDStyler-1.8.1.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/dvdstyler.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdstyler.spec 29 May 2010 20:01:04 -0000 1.14
+++ dvdstyler.spec 20 Nov 2010 23:28:12 -0000 1.15
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 1.8.0.3
-Release: 2%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -9,11 +9,12 @@
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
-Patch1: dvdstyler-1.8-libjpeg.patch
-Patch2: dvdstyler-1.8-template-subdir.patch
+Patch1: dvdstyler-wxVillaLib-libjpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
-BuildRequires: automake, autoconf, gettext
+BuildRequires: automake, autoconf
+BuildRequires: gettext
+BuildRequires: byacc
# libraries
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0-6
@@ -50,9 +51,8 @@
%prep
%setup -q -n DVDStyler-%{version}
-%patch0 -b .nonvalid
+%patch0 -b .validdesktop
%patch1 -b .libjpeg
-%patch2 -b .templates
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem
\\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -92,6 +92,9 @@
%{_mandir}/*/*.gz
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
+- Update to 1.8.1
+
* Sat May 29 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.0.3-2
- Link against libjpeg
- Package the template files
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 19 May 2010 19:47:28 -0000 1.9
+++ sources 20 Nov 2010 23:28:12 -0000 1.10
@@ -1 +1 @@
-4663f7036b0256d28ed745ed95e9736a DVDStyler-1.8.0.3.tar.bz2
+076bd95e15912c1c0f7f9165d0ea5632 DVDStyler-1.8.1.tar.bz2
--- dvdstyler-1.8-libjpeg.patch DELETED ---
--- dvdstyler-1.8-template-subdir.patch DELETED ---