Author: qboosh                       Date: Sat Mar  5 22:33:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build (including amd64)

---- Files affected:
SPECS:
   ksensors.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/ksensors.spec
diff -u SPECS/ksensors.spec:1.9 SPECS/ksensors.spec:1.10
--- SPECS/ksensors.spec:1.9     Sat Mar  5 18:13:34 2005
+++ SPECS/ksensors.spec Sat Mar  5 23:33:28 2005
@@ -9,14 +9,13 @@
 Source0:       http://dl.sourceforge.net/ksensors/%{name}-%{version}.tar.gz
 # Source0-md5: 4f6c5d7dea5e637e772d17f1e547d6f1
 URL:           http://ksensors.sourceforge.net/
+BuildRequires: automake
 BuildRequires: lm_sensors-devel
-BuildRequires: qt-devel >= 3.0
 BuildRequires: rpmbuild(macros) >= 1.129
+BuildRequires: qt-devel >= 3.0
 Requires:      lm_sensors
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _htmldir        /usr/share/doc/kde/HTML
-
 %description
 KSensors is a nice frontend for lm-sensors, a set of tools for
 monitoring the hardware health of Linux systems equipped with certain
@@ -33,8 +32,10 @@
 %setup -q
 
 %build
+cp -f /usr/share/automake/config.* admin
 kde_htmldir="%{_kdedocdir}"; export kde_htmldir
-%configure2_13
+%configure \
+       --with-qt-libraries=%{_libdir}
 %{__make}
 
 %install
@@ -42,7 +43,7 @@
 
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT \
-        desktopdir=%{_desktopdir}
+        shelldesktopdir=%{_desktopdir}
 
 %find_lang %{name} --with-kde
 
@@ -59,7 +60,7 @@
 %{_datadir}/apps/ksensors/pics/*
 %dir %{_datadir}/apps/sounds
 %{_datadir}/apps/sounds/*
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_iconsdir}/*/*/apps/*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -68,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/03/05 22:33:28  qboosh
+- fixed build (including amd64)
+
 Revision 1.9  2005/03/05 17:13:34  megabajt
 - unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ksensors.spec?r1=1.9&r2=1.10&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to