fix Makefile.am

Changed files:
    avifile-am_fix.patch -> 1.1
    avifile.spec -> 1.24

diff --git a/avifile-am_fix.patch b/avifile-am_fix.patch
new file mode 100644 (file)
index 0000000..5a9d49c
--- /dev/null
+++ b/avifile-am_fix.patch
@@ -0,0 +1,45 @@
+--- avifile-0.6.0/samples/artsplug/Makefile.am.wiget   Fri Jan 26 17:45:19 2001
++++ avifile-0.6.0/samples/artsplug/Makefile.am Fri Jan 26 17:32:27 2001
+@@ -1,5 +1,6 @@
+ # This file you have to edit. Change the name here
+ 
++LDFLAGS=@LDFLAGS@
+ #this is probably wrong.
+ #mcopclassdir variable should point somewhere inside KDE installation,
+ #I am not sure that .mcopclass will be found by aRts here.
+--- avifile-0.6.0/samples/Makefile.am.wiget    Fri Jan 26 17:18:31 2001
++++ avifile-0.6.0/samples/Makefile.am  Fri Jan 26 17:24:14 2001
+@@ -2,9 +2,9 @@
+ 
+ EXTRA_SUBDIRS=
+ if AM_USE_JPEGLIB
+-SUBDIRS_JPEG=mjpeg_plugin
++      SUBDIRS_JPEG=mjpeg_plugin
+ else
+-SUBDIRS_JPEG=
++      SUBDIRS_JPEG=
+ endif    
+ if AM_USE_VIDCAP
+ if AM_USE_QTRECOMP
+@@ -20,14 +20,16 @@
+ endif
+ endif
+ if AM_USE_QT
+-    EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_QT) $(SUBDIRS_JPEG)
++      EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG)
+ else    
+-    EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_JPEG)
++      EXTRA_SUBDIRS=$(SUBDIRS_JPEG)
+ endif
+ SUBDIRS_ARTS=
+ if AM_USE_ARTS
+-    SUBDIRS_ARTS=artsplug
++      SUBDIRS_ARTS=artsplug
++else
++      SUBDIRS_ARTS=
+ endif
+ SUBDIRS=$(SUBDIRS_ARTS) $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+ 
+-DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin
+\ No newline at end of file
++DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin

diff --git a/avifile.spec b/avifile.spec
index e61558a31263589ed87b8a6246767b4f9f200d37..5bdb5d461d0b65b09d6c65c0f8d65cbf1293ee7e 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -2,7 +2,7 @@ Summary:        Library and sample program for playing AVI files
 Summary(pl):   Biblioteka i przyk³adowy program do odtwarzania plików AVI
 Name:          avifile
 Version:       0.6.0
-Release:       0.beta2.1
+Release:       0.beta2.1.1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Multimedia
@@ -14,6 +14,7 @@ Patch0:               %{name}-bitrate.patch
 Patch1:                %{name}-shareware.patch
 Patch2:                %{name}-DESTDIR.patch
 Patch3:                %{name}-opt.patch
+Patch4:                %{name}-am_fix.patch
 Requires:      avi-codecs
 BuildRequires: unzip
 BuildRequires: libstdc++-devel
@@ -56,6 +57,7 @@ libaviplay.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 aclocal