SPECS: kst.spec - build fixes, -devel R: kdelibs-devel

qboosh qboosh at pld-linux.org
Sun Feb 19 17:25:33 CET 2006


Author: qboosh                       Date: Sun Feb 19 16:25:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build fixes, -devel R: kdelibs-devel

---- Files affected:
SPECS:
   kst.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/kst.spec
diff -u SPECS/kst.spec:1.4 SPECS/kst.spec:1.5
--- SPECS/kst.spec:1.4	Sun Feb 19 16:47:38 2006
+++ SPECS/kst.spec	Sun Feb 19 17:25:26 2006
@@ -11,8 +11,9 @@
 URL:		http://kst.kde.org
 BuildRequires:	cfitsio-devel
 BuildRequires:	gsl-devel
-BuildRequires:	kdelibs-devel
+BuildRequires:	kdelibs-devel >= 9:3.1
 BuildRequires:	netcdf-devel
+BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,6 +30,7 @@
 Summary(pl):	Pliki nagłówkowe do kst
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	kdelibs-devel >= 9:3.1
 
 %description devel
 kst files for developing applications.
@@ -40,12 +42,12 @@
 %setup -q
 
 %build
-kde_appsdir="%{_desktopdir}/kde"; export kde_appsdir
 kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
-	--disable-rpath
+	--disable-rpath \
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -53,9 +55,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	appsdir=%{_desktopdir}/kde
 
-mv $RPM_BUILD_ROOT%{_desktopdir}/kde/Applications/Sciences/* $RPM_BUILD_ROOT%{_desktopdir}/kde
 install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mv $RPM_BUILD_ROOT%{_datadir}/apps/kst/tutorial .
 
@@ -88,7 +90,7 @@
 %{_iconsdir}/*/*/*/*
 %{_mandir}/man1/*
 
-%files devel -f %{name}.lang
+%files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
@@ -102,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/02/19 16:25:26  qboosh
+- build fixes, -devel R: kdelibs-devel
+
 Revision 1.4  2006/02/19 15:47:38  qboosh
 - cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kst.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list