packages: mediainfo/mediainfo.spec - macros used, cleanups

charles charles at pld-linux.org
Sat Dec 5 01:35:16 CET 2009


Author: charles                      Date: Sat Dec  5 00:35:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- macros used, cleanups

---- Files affected:
packages/mediainfo:
   mediainfo.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/mediainfo/mediainfo.spec
diff -u packages/mediainfo/mediainfo.spec:1.2 packages/mediainfo/mediainfo.spec:1.3
--- packages/mediainfo/mediainfo.spec:1.2	Sat Dec  5 01:25:11 2009
+++ packages/mediainfo/mediainfo.spec	Sat Dec  5 01:35:10 2009
@@ -74,7 +74,7 @@
 
 %prep
 %setup -q -n MediaInfo
-dos2unix     *.html *.txt Release/*.txt
+dos2unix *.html *.txt Release/*.txt
 chmod 644 *.html *.txt Release/*.txt
 
 %build
@@ -84,25 +84,29 @@
 
 # build CLI
 cd Project/GNU/CLI
-	chmod +x autogen
-	./autogen
+	%{__libtoolize}
+	%{__aclocal}
+	%{__autoconf}
+	%{__automake}
 	%configure
 	%{__make}
-cd ../../..
+cd -
 
 # now build GUI
 cd Project/GNU/GUI
-	chmod +x autogen
-	./autogen
+	%{__libtoolize}
+	%{__aclocal}
+	%{__autoconf}
+	%{__automake}
 	%configure \
 		--with-wx-config=%{_bindir}/wx-gtk2-unicode-config
 	%{__make}
-cd ../../..
+cd -
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} -C Project/GNU/CLI \
-	 install \
+	install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C Project/GNU/GUI \
@@ -163,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/12/05 00:35:10  charles
+- macros used, cleanups
+
 Revision 1.2  2009/12/05 00:25:11  charles
 - updated BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mediainfo/mediainfo.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list