rpms/linpsk/devel linpsk.spec,1.6,1.7

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/linpsk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28431

Modified Files:
	linpsk.spec 
Log Message:
Build fix.



Index: linpsk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linpsk/devel/linpsk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linpsk.spec	30 Apr 2010 08:43:21 -0000	1.6
+++ linpsk.spec	2 May 2010 02:03:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           linpsk
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Psk31 and RTTY program for Linux
 
 Group:          Applications/Communications
@@ -12,7 +12,7 @@ Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fftw-devel
-BuildRequires:	qt3-devel
+BuildRequires:  qt-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -38,23 +38,24 @@ At the Moment RTTY only supports 45 baud
 
 %prep
 %setup -q -n %{name}
-libtoolize
-autoreconf
+#libtoolize
+#autoreconf
 
 #fix permissions for debuginfo files
 chmod 0644 $RPM_BUILD_DIR/%{name}/src/{rttydemodulator.cpp,cpskdemodulator.cpp,cpskdemodulator.h,rttydemodulator.h}
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-%configure
+qmake-qt4 -unix -o Makefile linpsk.pro
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 bin/linpsk $RPM_BUILD_ROOT%{_bindir}
 
 # no upstream .desktop or icon yet
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="fedora" \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
@@ -68,12 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog
+%doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Apr 30 2010 Jon Ciesla <limb at jcomserv.net>  - 1.1-2
+- Build, doc fixes.
+
 * Fri Apr 30 2010 Randall 'Randy' Berry <dp67 at fedoraproject.org>  - 1.1-1
 - Upstream update to 1.1