rpms/dvdauthor/F-13 .cvsignore, 1.6, 1.7 dvdauthor.spec, 1.16, 1.17 sources, 1.6, 1.7 0001-Use-pkg-config-to-find-FriBidi.patch, 1.1, NONE 0002-Fix-build-with-FriBidi-0.19.x.patch, 1.1, NONE dvdauthor-0.6.17-graphicsmagick.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/dvdauthor/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2651/F-13

Modified Files:
	.cvsignore dvdauthor.spec sources 
Removed Files:
	0001-Use-pkg-config-to-find-FriBidi.patch 
	0002-Fix-build-with-FriBidi-0.19.x.patch 
	dvdauthor-0.6.17-graphicsmagick.patch 
Log Message:
* Thu Mar 18 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.6.18-1
- Update to 0.6.18 ("official" again), all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Jan 2010 17:32:39 -0000	1.6
+++ .cvsignore	23 Apr 2010 18:36:47 -0000	1.7
@@ -1,2 +1 @@
-dvdauthor-0.6.17.tar.gz
-dvdauthor-doc-0.6.17.tar.gz
+dvdauthor-0.6.18.tar.gz


Index: dvdauthor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/F-13/dvdauthor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dvdauthor.spec	2 Jan 2010 17:34:38 -0000	1.16
+++ dvdauthor.spec	23 Apr 2010 18:36:49 -0000	1.17
@@ -1,16 +1,12 @@
 Name:           dvdauthor
-Version:        0.6.17
+Version:        0.6.18
 Release:        1%{?dist}
 Summary:        Command line DVD authoring tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dvdauthor.sourceforge.net/
-Source0:        http://www.joonet.de/dvdauthor/ftp/%{name}-%{version}.tar.gz
-Source1:        http://www.joonet.de/dvdauthor/ftp/%{name}-doc-%{version}.tar.gz
-Patch0:         %{name}-0.6.17-graphicsmagick.patch
-Patch1:         0001-Use-pkg-config-to-find-FriBidi.patch
-Patch2:         0002-Fix-build-with-FriBidi-0.19.x.patch
+Source0:        http://downloads.sourceforge.net/dvdauthor/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libdvdread-devel >= 0.9.4-4
@@ -21,8 +17,6 @@ BuildRequires:  libxml2-devel >= 2.6.0
 BuildRequires:  fribidi-devel
 BuildRequires:  freetype-devel
 BuildRequires:  GraphicsMagick-devel
-# autofoo etc for Patch0, Patch1
-BuildRequires:  autoconf automake gettext-devel
 
 %description
 dvdauthor is a program that will generate a DVD movie from a valid
@@ -30,18 +24,14 @@ MPEG-2 stream that should play when you 
 
 
 %prep
-%setup -q -a 1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-autoreconf # for Patch0, Patch1
-mv %{name}-doc-%{version}/html .
+%setup -q -n %{name}
+chmod -c -x src/subgen-image.c
 
 
 %build
 export MAGICKCONFIG=/bin/true # disable ImageMagick
 export LDFLAGS="$LDFLAGS -Wl,--as-needed" # avoid *Magick-config linkage bloat
-%configure --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -56,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO html/
+%doc ChangeLog COPYING README TODO
 %{_bindir}/dvdauthor
 %{_bindir}/dvddirdel
 %{_bindir}/dvdunauthor
@@ -73,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 18 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.6.18-1
+- Update to 0.6.18 ("official" again), all patches applied upstream.
+
 * Sat Jan  2 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.6.17-1
 - Update to 0.6.17 (new "unofficial" upstream: http://www.joonet.de/dvdauthor/).
 - Patch to compile with FriBidi 0.19.x.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Jan 2010 17:32:39 -0000	1.6
+++ sources	23 Apr 2010 18:36:49 -0000	1.7
@@ -1,2 +1 @@
-27ef1b20dcdf7a42906c0d2b52e0b461  dvdauthor-0.6.17.tar.gz
-9f2049b0973248bd2e33444bc58243a2  dvdauthor-doc-0.6.17.tar.gz
+ded5373800ac6448ff044606f5047550  dvdauthor-0.6.18.tar.gz


--- 0001-Use-pkg-config-to-find-FriBidi.patch DELETED ---


--- 0002-Fix-build-with-FriBidi-0.19.x.patch DELETED ---


--- dvdauthor-0.6.17-graphicsmagick.patch DELETED ---