packages: k3b/k3b.spec - updated for Titanium and kde4-kde3support - hopefu...

shadzik shadzik at pld-linux.org
Sun Jul 12 17:21:45 CEST 2009


Author: shadzik                      Date: Sun Jul 12 15:21:45 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for Titanium and kde4-kde3support
- hopefully works

---- Files affected:
packages/k3b:
   k3b.spec (1.181 -> 1.182) 

---- Diffs:

================================================================
Index: packages/k3b/k3b.spec
diff -u packages/k3b/k3b.spec:1.181 packages/k3b/k3b.spec:1.182
--- packages/k3b/k3b.spec:1.181	Sat Jul 11 23:47:58 2009
+++ packages/k3b/k3b.spec	Sun Jul 12 17:21:40 2009
@@ -22,8 +22,7 @@
 Patch1:		%{name}-group.patch
 Patch2:		%{name}-libadd.patch
 Patch3:		%{name}-ffmpeg.patch
-Patch4:		%{name}-nodocs.patch
-Patch5:		%{name}-kde3support.patch
+Patch4:		%{name}-kde3support.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -307,19 +306,22 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+for dir in . k3b-i18n-*; do
+	cd $dir
+	cp -f /usr/share/automake/config.sub admin
+	cp -f /usr/share/libtool/config/ltmain.sh admin
+	: > admin/libtool.m4.in
+	rm -f acinclude.m4
+	cd -
+done
 %if "%{pld_release}" == "ti"
 %patch4 -p0
-%patch5 -p0
 %endif
 
 %build
 curdir=$(pwd)
 for dir in . k3b-i18n-*; do
 	cd $dir
-	cp -f /usr/share/automake/config.sub admin
-	cp -f /usr/share/libtool/config/ltmain.sh admin
-	: > admin/libtool.m4.in
-	rm -f acinclude.m4
 	%{__make} -f admin/Makefile.common
 	%configure \
 		--%{!?debug:dis}%{?debug:en}able-debug \
@@ -327,6 +329,10 @@
 		%{!?with_setup:--with-k3bsetup=no} \
 		--with-qt-libraries=%{_libdir} \
 		%{!?with_hal:--without-hal} \
+%if "%{pld_release}" == "ti"
+		--with-extra-libs=%{_libdir}/kde3dev \
+		--with-extra-includes=%{_includedir}/kde3 \
+%endif
 		%{!?with_resmgr:--without-resmgr}
 	cd $curdir
 done
@@ -493,6 +499,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.182  2009/07/12 15:21:40  shadzik
+- updated for Titanium and kde4-kde3support
+- hopefully works
+
 Revision 1.181  2009/07/11 21:47:58  shadzik
 - add 2 patches for Titanium
 - NFY, some parts still doesn't link right, but the idea works
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/k3b/k3b.spec?r1=1.181&r2=1.182&f=u



More information about the pld-cvs-commit mailing list