SPECS: avifile.spec - dropped avifile_confix_fix, don't create inc...

[qboosh]

Author: qboosh                       Date: Thu Dec  1 13:58:33 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped avifile_confix_fix, don't create incompatibilities by renaming
  headers dir
- install cleanup, release 2

---- Files affected:
SPECS:
   avifile.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: SPECS/avifile.spec
diff -u SPECS/avifile.spec:1.179 SPECS/avifile.spec:1.180
--- SPECS/avifile.spec:1.179	Tue Nov  1 00:18:05 2005
+++ SPECS/avifile.spec	Thu Dec  1 14:58:27 2005
@@ -11,7 +11,7 @@
 Summary(pt_BR):	Biblioteca para reproduzir formatos de áudio e vídeo usando binários win32
 Name:		avifile
 Version:	0.7.43
-Release:	1%{?with_divx:+divx}
+Release:	2%{?with_divx:+divx}
 Epoch:		3
 License:	GPL
 Group:		X11/Libraries
@@ -24,13 +24,12 @@
 Patch3:		%{name}-aviplay_h.patch
 Patch4:		%{name}-no_aux_dir.patch
 Patch5:		%{name}-link_shared.patch
-Patch6:		%{name}-avifile_config_fix.patch
-Patch7:		%{name}-no_libnsl.patch
-Patch8:		%{name}-system-libmad.patch
-Patch9:		%{name}-ffmpeg-alpha.patch
-Patch10:	%{name}-opt.patch
-Patch11:	%{name}-ffmpeg-ppc.patch
-Patch12:	%{name}-opts.patch
+Patch6:		%{name}-no_libnsl.patch
+Patch7:		%{name}-system-libmad.patch
+Patch8:		%{name}-ffmpeg-alpha.patch
+Patch9:		%{name}-opt.patch
+Patch10:	%{name}-ffmpeg-ppc.patch
+Patch11:	%{name}-opts.patch
 URL:		http://avifile.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
 BuildRequires:	XFree86-devel
@@ -333,7 +332,6 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 # unwanted hack
 rm -f m4/as.m4
@@ -376,22 +374,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/%{name},%{_libdir},/usr/lib/win32,%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{/usr/lib/win32,%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	m4datadir=%{_aclocaldir}
 
-cp -f include/fourcc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-
 # conflicts with ???
 mv -f $RPM_BUILD_ROOT%{_bindir}/kv4lsetup $RPM_BUILD_ROOT%{_bindir}/akv4lsetup
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/kv4lsetup.1 $RPM_BUILD_ROOT%{_mandir}/man1/akv4lsetup.1
 %{__perl} -pi -e 's/(kv4l|k4vl)/akv4l/g' $RPM_BUILD_ROOT%{_mandir}/man1/akv4lsetup.1
 
-mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}-0.7/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-rmdir $RPM_BUILD_ROOT%{_includedir}/%{name}-0.7
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install bin/test.png $RPM_BUILD_ROOT%{_pixmapsdir}/avifile.png
 
@@ -429,9 +422,9 @@
 %attr(755,root,root) %{_bindir}/avifile-config
 %attr(755,root,root) %{_libdir}/libaviplay*.so
 %{_libdir}/lib*.la
-%{_includedir}/%{name}
+%{_includedir}/avifile*
 %{_aclocaldir}/*.m4
-%{_pkgconfigdir}/%{name}.pc
+%{_pkgconfigdir}/avifile.pc
 %{_mandir}/man1/avifile-config.1*
 
 %if %{with qt}
@@ -532,6 +525,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.180  2005/12/01 13:58:27  qboosh
+- dropped avifile_confix_fix, don't create incompatibilities by renaming
+  headers dir
+- install cleanup, release 2
+
 Revision 1.179  2005/10/31 23:18:05  arekm
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/avifile.spec?r1=1.179&r2=1.180&f=u