SPECS: avidemux.spec - cleanup - fixed amrnb bcond to actually do ...

[qboosh]

Author: qboosh                       Date: Fri Jan  4 13:30:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup
- fixed amrnb bcond to actually do something, unified its name to "amr"
- GPL v2+

---- Files affected:
SPECS:
   avidemux.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/avidemux.spec
diff -u SPECS/avidemux.spec:1.57 SPECS/avidemux.spec:1.58
--- SPECS/avidemux.spec:1.57	Fri Jan  4 12:57:26 2008
+++ SPECS/avidemux.spec	Fri Jan  4 14:30:20 2008
@@ -4,14 +4,14 @@
 #	- create aften.spec (aften.sf.net) and use it
 #
 # Conditional build:
-%bcond_with	amrnb		# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
+%bcond_with	amr	# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
 #
 Summary:	A small audio/video editing software for Linux
 Summary(pl.UTF-8):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
 Version:	2.4
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://download2.berlios.de/avidemux/%{name}_%{version}.tar.gz
 # Source0-md5:	2a752b9f6bab4123566894a6a21b353b
@@ -22,7 +22,7 @@
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel >= 1.0
-%{?with_amrnb:BuildRequires:	amrnb-devel}
+%{?with_amr:BuildRequires:	amrnb-devel}
 BuildRequires:	artsc-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -59,23 +59,25 @@
 %patch0 -p1
 %patch1 -p0
 
-%{__sed} -i 's/charset=Unicode/charset=UTF-8/' po/ru.po
-%{__sed} -i 's/klingon/de\npt_BR/' po/LINGUAS
+echo 'pt_BR' >> po/LINGUAS
 
 %build
 export kde_htmldir=%{_kdedocdir}
 export kde_libs_htmldir=%{_kdedocdir}
 %{__make} -f admin/Makefile.common cvs
 %configure \
+	%{!?with_amr:ac_cv_header_amrnb_interf_dec_h=no} \
+	--disable-static \
 %ifarch ppc
 	--enable-altivec \
 %endif
-	--with-jsapi-include=%{_includedir}/js \
-	--disable-static
+	--with-jsapi-include=%{_includedir}/js
+# moc-qt4 expected
+#	--with-qt-dir=%{_prefix} \
+#	--with-qt-include=%{_includedir}/qt4 \
+#	--with-qt-lib=%{_libdir}
 
-cd po
-%{__make} -j1
-cd ..
+%{__make} -j1 -C po
 %{__make}
 
 %install
@@ -107,6 +109,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2008-01-04 13:30:20  qboosh
+- cleanup
+- fixed amrnb bcond to actually do something, unified its name to "amr"
+- GPL v2+
+
 Revision 1.57  2008-01-04 11:57:26  sls
 - added bcond amrnb
 - BR: libx264-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/avidemux.spec?r1=1.57&r2=1.58&f=u