SPECS: konference.spec - distcc workaround (CXXLD) - llh hack - bu...

glen glen at pld-linux.org
Fri Feb 3 16:18:52 CET 2006


Author: glen                         Date: Fri Feb  3 15:18:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- distcc workaround (CXXLD)
- llh hack
- built for me

---- Files affected:
SPECS:
   konference.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/konference.spec
diff -u SPECS/konference.spec:1.2 SPECS/konference.spec:1.3
--- SPECS/konference.spec:1.2	Fri Feb  3 15:29:52 2006
+++ SPECS/konference.spec	Fri Feb  3 16:18:46 2006
@@ -11,12 +11,12 @@
 URL:		http://developer.berlios.de/projects/konference/
 Source0:	http://download.berlios.de/konference/%{name}-%{version}%{_rc}.tar.gz
 # Source0-md5:	89e721b9172673b73e7eb44bf1a22522
+Patch0:		%{name}-llh.patch
 BuildRequires:	arts-devel
 BuildRequires:	ffmpeg-devel
 BuildRequires:	kdelibs-devel
 BuildRequires:	qt-devel
-# some kind of llh
-#BuildRequires:	linux-libc-headers
+BuildRequires:	linux-libc-headers
 #BuildRequires:	sip-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -45,11 +46,13 @@
     --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
     --with-qt-libraries=%{_libdir}
 
-%{__make}
+%{__make} \
+	CXXLD=%{_host_cpu}-%{_vendor}-%{_os}-g++ \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
+	shelldesktopdir=%{_desktopdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -64,6 +67,7 @@
 %{_datadir}/config.kcfg/konference.kcfg
 %{_datadir}/services/konference_part.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
+%{_desktopdir}/*.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -71,10 +75,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/02/03 15:18:46  glen
+- distcc workaround (CXXLD)
+- llh hack
+- built for me
+
 Revision 1.2  2006/02/03 14:29:52  spider
 - pl
 
 Revision 1.1  2006/02/03 14:07:37  glen
 - new, build fails somewhere in llh
 - where's sip-devel in pld?
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/konference.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list