rpms/taskjuggler/FC-6 taskjuggler.spec,1.6,1.7

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/taskjuggler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2915

Modified Files:
	taskjuggler.spec 
Log Message:
sync with F-7:
- setup QTDIR and use find_lang macro to fix build
- buildrequire gettext for untranslated .po file



Index: taskjuggler.spec
===================================================================
RCS file: /cvs/extras/rpms/taskjuggler/FC-6/taskjuggler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- taskjuggler.spec	7 Jun 2007 10:13:43 -0000	1.6
+++ taskjuggler.spec	8 Jun 2007 07:51:30 -0000	1.7
@@ -10,6 +10,8 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kdepim-devel
+# need gettext for untranslated .po files
+Buildrequires: gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Patch1:        taskjuggler-2.1.1-docbook.patch
@@ -28,14 +30,17 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .memoryleakspackage
+%patch1 -p1 -b .1-orig
+%patch2 -p1 -b .2-memoryleakspackage
+
 
-%define _unpackaged_files_terminate_build 0
 %build
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --with-qt-includes=%{_libdir}/qt-3.3/include --with-qt-libraries=%{_libdir}/qt-3.3/lib --with-kde-support=yes --disable-rpath
+# doc build fails with -j4 
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export DESTDIR="$RPM_BUILD_ROOT"
@@ -50,6 +55,8 @@
 
 rm $RPM_BUILD_ROOT%{_libdir}/libtaskjuggler.{la,so}
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,7 +84,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/TaskJugglerUI
@@ -94,10 +101,13 @@
 
 
 %changelog
+* Fri Jun  8 2007 Jens Petersen <petersen at redhat.com>
+- setup QTDIR and use find_lang macro to fix build
+- buildrequire gettext for untranslated .po file
+
 * Thu Jun  7 2007 Ondrej Vasik  <ovasik at redhat.com> -2.3.1-2
 - fixed number of memory leaks (from upstream)
-- removed %{?_smp_mflags} after make in %build section
-- (caused build failure) #233028 against RHEL5, but same for FC-6
+- removed _smp_mflags to avoid build failures with 4+ cpus (#233028)
 
 * Thu Mar  8 2007 Jens Petersen <petersen at redhat.com> - 2.3.1-1
 - update to 2.3.1