rpms/kchmviewer/devel kchmviewer.spec,1.12,1.13

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/kchmviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3933

Modified Files:
	kchmviewer.spec 
Log Message:
add build fixes from EL branches


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kchmviewer.spec	3 Aug 2007 12:11:22 -0000	1.12
+++ kchmviewer.spec	27 Dec 2007 17:38:12 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           kchmviewer
 Version:        3.1
-Release:        1%{?dist}.1
+Release:        1%{?dist}.5
 Summary:        CHM viewer with KDE support
 
 Group:          Applications/Publishing
-License:        GPL
+License:        GPLv2+
 URL:            http://www.kchmviewer.net/
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 # fix the desktop file
@@ -28,6 +28,10 @@
 
 
 %build
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+[ -n "$QTLIB" ] || export QTLIB="$QTDIR/lib"
+[ -n "$QTINC" ] || export QTINC="$QTDIR/include"
+
 %configure --disable-static --with-kde --disable-rpath \
  --disable-dependency-tracking --disable-strict --disable-warnings
 make %{?_smp_mflags}
@@ -42,7 +46,7 @@
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
 
 # remove static libs, they have no interface, libkdeextra is too generic
 rm ${RPM_BUILD_ROOT}%{_libdir}/libchmfile.a 
@@ -78,7 +82,7 @@
 
 
 %changelog
-* Thu Aug  2 2007 Patrice Dumas <pertusus at free.fr> 3.1-1.1
+* Thu Aug  2 2007 Patrice Dumas <pertusus at free.fr> 3.1-1.5
 - update to 3.1
 
 * Sun Apr  1 2007 Patrice Dumas <pertusus at free.fr> 3.0-2