packages: gnuradio/gnuradio.spec - fix reinstall

[glen]

Author: glen                         Date: Sun Apr  1 16:04:41 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix reinstall

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

---- Diffs:

================================================================
Index: packages/gnuradio/gnuradio.spec
diff -u packages/gnuradio/gnuradio.spec:1.2 packages/gnuradio/gnuradio.spec:1.3
--- packages/gnuradio/gnuradio.spec:1.2	Sun Apr  1 17:40:19 2012
+++ packages/gnuradio/gnuradio.spec	Sun Apr  1 18:04:36 2012
@@ -13,7 +13,7 @@
 Release:	0.%{snaps}.1
 License:	GPL v3
 Group:		Applications/Engineering
-URL:		http://www.gnuradio.org
+URL:		http://www.gnuradio.org/
 Source0:	http://gnuradio.org/files/builds/%{name}-%{version}-%{snap}.tar.gz
 # Source0-md5:	597245618a773bad2ff6b973e83d5bcb
 Patch0:		%{name}-build.patch
@@ -48,14 +48,14 @@
 %{?with_uhd:BuildRequires:	uhd-devel}
 BuildRequires:	xdg-utils
 BuildRequires:	xmlto
-Requires:	python-PyQt4
 Requires:	portaudio
+Requires:	python-PyQt4
 Requires:	python-cheetah
 Requires:	python-lxml
 Requires:	python-numpy
 Requires:	python-pygtk-gtk
-Requires:	python-wxPython
 Requires:	python-scipy
+Requires:	python-wxPython
 Obsoletes:	grc < 0.80-1
 Obsoletes:	usrp < 3.3.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,8 +88,8 @@
 %setup -q -n %{name}
 %patch0 -p1
 
-#force regeneration of cached moc output files
-find . -name "*_moc.cc" -exec rm {} \;
+# force regeneration of cached moc output files
+find -name "*_moc.cc" | xargs rm
 
 %build
 %{__libtoolize}
@@ -135,14 +135,15 @@
 %{__make} install -j1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf inst-doc
 install -d inst-doc
-mv $RPM_BUILD_ROOT%{_docdir}/gnuradio-*/* inst-doc/
+mv $RPM_BUILD_ROOT%{_docdir}/gnuradio-*/* inst-doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -215,9 +216,11 @@
 
 
 $Log$
+Revision 1.3  2012/04/01 16:04:36  glen
+- fix reinstall
+
 Revision 1.2  2012/04/01 15:40:19  arekm
 - files finished; builds
 
 Revision 1.1  2012/04/01 13:26:22  arekm
 - almost raw
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnuradio/gnuradio.spec?r1=1.2&r2=1.3